Here are some more patches for calc. Have fun!
From b9c01e903e5e86e29e1ab27b0a8e53733bb82b9e Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 17:25:58 +0100
Subject: [PATCH 1/7] Remove dead code: "//static" and "//virtual"
---
.../controller/chartapiwrapper/AxisWrapper.cxx | 1 -
.../controller/chartapiwrapper/DiagramWrapper.cxx | 1 -
.../controller/chartapiwrapper/GridWrapper.cxx | 1 -
.../WrappedAutomaticPositionProperties.cxx | 6 ---
.../WrappedAxisAndGridExistenceProperties.cxx | 3 --
.../WrappedCharacterHeightProperty.cxx | 1 -
.../WrappedDataCaptionProperties.cxx | 5 ---
.../chartapiwrapper/WrappedScaleProperty.cxx | 1 -
.../chartapiwrapper/WrappedScaleTextProperties.cxx | 3 --
.../chartapiwrapper/WrappedSceneProperty.cxx | 1 -
.../WrappedSeriesAreaOrLineProperty.cxx | 1 -
.../chartapiwrapper/WrappedSplineProperties.cxx | 3 --
.../chartapiwrapper/WrappedStatisticProperties.cxx | 3 --
.../chartapiwrapper/WrappedStockProperties.cxx | 3 --
.../chartapiwrapper/WrappedSymbolProperties.cxx | 5 ---
chart2/source/controller/dialogs/DialogModel.cxx | 4 --
.../controller/dialogs/ObjectNameProvider.cxx | 9 +----
.../source/controller/dialogs/dlg_DataSource.cxx | 1 -
.../controller/dialogs/dlg_InsertErrorBars.cxx | 1 -
.../source/controller/dialogs/dlg_NumberFormat.cxx | 1 -
chart2/source/controller/dialogs/dlg_View3D.cxx | 2 -
.../controller/drawinglayer/DrawViewWrapper.cxx | 2 -
.../controller/itemsetwrapper/ItemConverter.cxx | 2 -
.../controller/main/ChartController_Tools.cxx | 1 -
chart2/source/controller/main/ImplUndoManager.cxx | 2 -
chart2/source/controller/main/ObjectHierarchy.cxx | 2 -
chart2/source/controller/main/SelectionHelper.cxx | 10 -----
chart2/source/controller/main/UndoManager.cxx | 2 -
chart2/source/model/template/ChartTypeTemplate.cxx | 1 -
chart2/source/model/template/DataInterpreter.cxx | 4 --
.../template/_serviceregistration_charttypes.cxx | 1 -
chart2/source/tools/AxisHelper.cxx | 36 ------------------
chart2/source/tools/CharacterProperties.cxx | 1 -
chart2/source/tools/ChartModelHelper.cxx | 7 ----
chart2/source/tools/ChartTypeHelper.cxx | 2 -
chart2/source/tools/ChartViewHelper.cxx | 1 -
chart2/source/tools/ColorPerPointHelper.cxx | 2 -
chart2/source/tools/DiagramHelper.cxx | 28 --------------
chart2/source/tools/ExplicitCategoriesProvider.cxx | 2 -
chart2/source/tools/FillProperties.cxx | 1 -
chart2/source/tools/LegendHelper.cxx | 4 --
chart2/source/tools/LineProperties.cxx | 3 --
chart2/source/tools/NamedFillProperties.cxx | 1 -
chart2/source/tools/NamedLineProperties.cxx | 1 -
chart2/source/tools/NamedProperties.cxx | 1 -
chart2/source/tools/ObjectIdentifier.cxx | 39 --------------------
chart2/source/tools/RegressionCurveCalculator.cxx | 2 -
chart2/source/tools/RegressionCurveHelper.cxx | 16 --------
chart2/source/tools/RelativePositionHelper.cxx | 3 --
chart2/source/tools/RelativeSizeHelper.cxx | 2 -
chart2/source/tools/StatisticsHelper.cxx | 12 ------
chart2/source/tools/ThreeDHelper.cxx | 13 +------
chart2/source/tools/WrappedIgnoreProperty.cxx | 4 --
chart2/source/tools/WrappedProperty.cxx | 1 -
chart2/source/view/axes/TickmarkHelper.cxx | 4 +--
chart2/source/view/axes/VAxisProperties.cxx | 1 -
chart2/source/view/axes/VCartesianGrid.cxx | 1 -
chart2/source/view/axes/VCoordinateSystem.cxx | 1 -
chart2/source/view/axes/VPolarGrid.cxx | 1 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 3 --
chart2/source/view/main/ChartItemPool.cxx | 1 -
chart2/source/view/main/ChartView.cxx | 6 ---
chart2/source/view/main/DrawModelWrapper.cxx | 2 -
chart2/source/view/main/LabelPositionHelper.cxx | 3 --
chart2/source/view/main/PlottingPositionHelper.cxx | 1 -
chart2/source/view/main/PropertyMapper.cxx | 10 -----
chart2/source/view/main/ShapeFactory.cxx | 10 -----
chart2/source/view/main/VLegend.cxx | 1 -
chart2/source/view/main/VLegendSymbolFactory.cxx | 1 -
sc/source/core/data/dbdocutl.cxx | 1 -
sc/source/core/data/docpool.cxx | 2 +-
sc/source/core/data/documen2.cxx | 1 -
sc/source/core/data/documen3.cxx | 1 -
sc/source/core/data/dpobject.cxx | 5 ---
sc/source/core/data/dpoutput.cxx | 1 -
sc/source/core/data/dptabres.cxx | 1 -
sc/source/core/data/drwlayer.cxx | 13 +++----
sc/source/core/data/global.cxx | 5 ---
sc/source/core/data/globalx.cxx | 2 -
sc/source/core/data/sheetevents.cxx | 3 --
sc/source/core/inc/interpre.hxx | 1 -
sc/source/core/tool/addincol.cxx | 1 -
sc/source/core/tool/addinlis.cxx | 3 --
sc/source/core/tool/autoform.cxx | 3 --
sc/source/core/tool/charthelper.cxx | 3 --
sc/source/core/tool/chgtrack.cxx | 11 ------
sc/source/core/tool/compiler.cxx | 3 --
sc/source/core/tool/detfunc.cxx | 7 +---
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/odffmap.cxx | 2 -
sc/source/core/tool/optutil.cxx | 1 -
sc/source/core/tool/progress.cxx | 2 -
sc/source/core/tool/rangenam.cxx | 2 +-
sc/source/core/tool/rangeseq.cxx | 1 -
sc/source/core/tool/token.cxx | 1 -
sc/source/core/tool/unitconv.cxx | 1 -
sc/source/filter/excel/xestyle.cxx | 6 ++--
sc/source/filter/excel/xiescher.cxx | 10 +++---
sc/source/filter/xml/XMLConverter.cxx | 2 +-
sc/source/ui/app/drwtrans.cxx | 1 -
sc/source/ui/app/rfindlst.cxx | 2 +-
sc/source/ui/app/scmod2.cxx | 3 --
sc/source/ui/app/seltrans.cxx | 1 -
sc/source/ui/app/transobj.cxx | 5 ---
sc/source/ui/docshell/dbdocimp.cxx | 1 -
sc/source/ui/docshell/docsh.cxx | 14 ++++----
sc/source/ui/docshell/tablink.cxx | 6 ++--
sc/source/ui/inc/impex.hxx | 2 -
sc/source/ui/miscdlgs/solverutil.cxx | 3 --
sc/source/ui/navipi/content.cxx | 2 +-
sc/source/ui/optdlg/tpformula.cxx | 1 -
sc/source/ui/undo/areasave.cxx | 1 -
sc/source/ui/undo/undobase.cxx | 4 +-
sc/source/ui/undo/undostyl.cxx | 1 -
sc/source/ui/unoobj/afmtuno.cxx | 2 -
sc/source/ui/unoobj/cellsuno.cxx | 7 +---
sc/source/ui/unoobj/datauno.cxx | 4 --
sc/source/ui/unoobj/docuno.cxx | 3 --
sc/source/ui/unoobj/fielduno.cxx | 4 --
sc/source/ui/unoobj/fmtuno.cxx | 4 --
sc/source/ui/unoobj/funcuno.cxx | 1 -
sc/source/ui/unoobj/miscuno.cxx | 11 ------
sc/source/ui/unoobj/nameuno.cxx | 2 -
sc/source/ui/unoobj/optuno.cxx | 3 --
sc/source/ui/unoobj/shapeuno.cxx | 1 -
sc/source/ui/unoobj/srchuno.cxx | 2 -
sc/source/ui/unoobj/styleuno.cxx | 5 ---
sc/source/ui/unoobj/textuno.cxx | 2 +-
sc/source/ui/unoobj/tokenuno.cxx | 2 -
sc/source/ui/unoobj/viewuno.cxx | 2 -
sc/source/ui/vba/vbarange.cxx | 8 ++--
sc/source/ui/view/dbfunc4.cxx | 1 -
132 files changed, 41 insertions(+), 478 deletions(-)
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 26c8357..647ad53 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -428,7 +428,6 @@ uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
return uno::Reference< util::XNumberFormats >();
}
-// static
void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex,
sal_Bool& rbMainAxis )
{
switch( eType )
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 3e285fa..61682b0 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -571,7 +571,6 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
}
typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakeStringStringMap;
-//static
const tMakeStringStringMap& lcl_getChartTypeNameMap()
{
static tMakeStringStringMap g_aChartTypeNameMap =
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 649a996..06220d2 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -104,7 +104,6 @@ GridWrapper::GridWrapper(
GridWrapper::~GridWrapper()
{}
-// static
void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool&
rbSubGrid )
{
rnDimensionIndex = 1;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 4b8681b..949d51e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -130,9 +130,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
}//anonymous namespace
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//static
void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties
)
{
rOutProperties.push_back(
@@ -144,9 +141,6 @@ void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
-//static
void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< WrappedProperty* >&
rList )
{
lcl_addWrappedProperties( rList );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 83289bf..fbcc6e5 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -70,7 +70,6 @@ private: //member
sal_Int32 m_nDimensionIndex;
};
-//static
void WrappedAxisAndGridExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
@@ -240,7 +239,6 @@ private: //member
TitleHelper::eTitleType m_eTitleType;
};
-//static
void WrappedAxisTitleExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
@@ -360,7 +358,6 @@ private: //member
sal_Int32 m_nDimensionIndex;
};
-//static
void WrappedAxisLabelExistenceProperties::addWrappedProperties( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 591b6e4..0c3b698 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -63,7 +63,6 @@ WrappedCharacterHeightProperty_Base::~WrappedCharacterHeightProperty_Base()
{
}
-//static
void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ReferenceSizePropertyProvider* pRefSizePropProvider )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 1edf7e5..c66fed9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -120,7 +120,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -133,8 +132,6 @@ void WrappedDataCaptionProperties::addProperties( ::std::vector< Property > & rO
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
@@ -143,8 +140,6 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForSeries( std::vector< W
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty*
& rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index c88f7ab..de21e98 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -108,7 +108,6 @@ WrappedScaleProperty::~WrappedScaleProperty()
{
}
-//static
void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 0d8338f..3b9fb69 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -142,7 +142,6 @@ enum
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -155,8 +154,6 @@ void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOut
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedScaleTextProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index db09e53..4566807 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -47,7 +47,6 @@ namespace chart
namespace wrapper
{
-//static
void WrappedSceneProperty::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index c6d3d0c..fc477b6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -58,7 +58,6 @@ WrappedSeriesAreaOrLineProperty::~WrappedSeriesAreaOrLineProperty()
{
}
-//virtual
::rtl::OUString WrappedSeriesAreaOrLineProperty::getInnerName() const
{
if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index a3e5624..7be0e6d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -198,7 +198,6 @@ enum
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -226,8 +225,6 @@ void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutPro
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index b7df21f..dc222eb 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -1033,7 +1033,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
}//anonymous namespace
-//static
void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -1129,7 +1128,6 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > &
rOut
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
@@ -1139,7 +1137,6 @@ void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector<
Wra
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index d678c48..1883d44 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -292,7 +292,6 @@ enum
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -313,8 +312,6 @@ void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProp
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedStockProperties::addWrappedProperties( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index f814691..23938e1 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -202,7 +202,6 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
@@ -236,8 +235,6 @@ void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutPro
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
@@ -246,8 +243,6 @@ void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< Wrappe
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >&
rList
, ::boost::shared_ptr< Chart2ModelContact >
spChart2ModelContact )
{
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 021817a..25beb4f 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -725,20 +725,16 @@ bool DialogModel::setData(
return true;
}
-// static
OUString DialogModel::ConvertRoleFromInternalToUI( const OUString & rRoleString )
{
return lcl_ConvertRole( rRoleString, true );
}
-// static
OUString DialogModel::GetRoleDataLabel()
{
return OUString( String( ::chart::SchResId( STR_OBJECT_DATALABELS )));
}
-// static
-
sal_Int32 DialogModel::GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString )
{
static lcl_tRoleIndexMap aRoleIndexMap;
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index d41fa82..33f9fcc 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -332,7 +332,7 @@ rtl::OUString ObjectNameProvider::getName( ObjectType eObjectType, bool bPlural
}
return aRet;
}
-//static
+
rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
{
@@ -373,7 +373,6 @@ rtl::OUString ObjectNameProvider::getAxisName( const rtl::OUString& rObjectCID
return aRet;
}
-//static
OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
{
OUString aRet;
@@ -412,7 +411,6 @@ OUString ObjectNameProvider::getTitleNameByType( TitleHelper::eTitleType eType )
return aRet;
}
-//static
OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
{
@@ -432,7 +430,6 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID
return aRet;
}
-//static
rtl::OUString ObjectNameProvider::getGridName( const rtl::OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
{
@@ -704,7 +701,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
return aRet;
}
-// static
rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & rObjectCID, const
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument )
{
rtl::OUString aRet;
@@ -758,7 +754,6 @@ rtl::OUString ObjectNameProvider::getSelectedObjectText( const rtl::OUString & r
}
-// static
rtl::OUString ObjectNameProvider::getNameForCID(
const rtl::OUString& rObjectCID,
const uno::Reference< chart2::XChartDocument >& xChartDocument )
@@ -814,7 +809,6 @@ rtl::OUString ObjectNameProvider::getNameForCID(
return getName( eType );
}
-//static
rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
ObjectType eObjectType,
const rtl::OUString& rSeriesCID,
@@ -833,7 +827,6 @@ rtl::OUString ObjectNameProvider::getName_ObjectForSeries(
return ObjectNameProvider::getName_ObjectForAllSeries( eObjectType );
}
-//static
rtl::OUString ObjectNameProvider::getName_ObjectForAllSeries( ObjectType eObjectType )
{
OUString aRet = String(SchResId(STR_OBJECT_FOR_ALL_SERIES));
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index bb0aecb..68de5cc 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -147,7 +147,6 @@ void DataSourceTabControl::EnableTabToggling()
// ----------------------------------------
-// static
USHORT DataSourceDialog::m_nLastPageId = 0;
DataSourceDialog::DataSourceDialog(
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index da6ef08..27b5af1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -96,7 +96,6 @@ void InsertErrorBarsDialog::SetAxisMinorStepWidthForErrorBarDecimals( double fMi
m_apErrorBarResources->SetAxisMinorStepWidthForErrorBarDecimals( fMinorStepWidth );
}
-//static
double InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals(
const Reference< frame::XModel >& xChartModel,
const Reference< uno::XInterface >& xChartView,
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 8b8df60..a22b6f7 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -68,7 +68,6 @@ NumberFormatDialog::~NumberFormatDialog()
{
}
-//static
SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool )
{
static const USHORT nWhichPairs[] =
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx
b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 7948216..092458b 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -57,8 +57,6 @@ using namespace ::com::sun::star::chart2;
//-----------------------------------------------------------------------------
//-------------------------------------------------------------------
//-------------------------------------------------------------------
-
-// static
USHORT View3DDialog::m_nLastPageId = 0;
View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel,
XColorTable* pColorTable )
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 4a6c9f6..5918903 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -185,7 +185,6 @@ SdrPageView* DrawViewWrapper::GetPageView() const
return pSdrPageView;
};
-//virtual
void DrawViewWrapper::SetMarkHandles()
{
if( m_pMarkHandleProvider && m_pMarkHandleProvider->getMarkHandles( aHdl ) )
@@ -385,7 +384,6 @@ void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
}
-//static
SdrObject* DrawViewWrapper::getSdrObject( const uno::Reference<
drawing::XShape >& xShape )
{
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index adbc19f..319659c 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -239,8 +239,6 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
}
// --------------------------------------------------------------------------------
-
-//static
void ItemConverter::InvalidateUnequalItems( SfxItemSet &rDestSet, const SfxItemSet &rSourceSet )
{
SfxWhichIter aIter (rSourceSet);
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index a6353c9..0e453e7 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -582,7 +582,6 @@ void ChartController::executeDispatch_Cut()
executeDispatch_Delete();
}
-//static
bool ChartController::isObjectDeleteable( const uno::Any& rSelection )
{
ObjectIdentifier aSelOID( rSelection );
diff --git a/chart2/source/controller/main/ImplUndoManager.cxx
b/chart2/source/controller/main/ImplUndoManager.cxx
index 798a778..c8433c6 100644
--- a/chart2/source/controller/main/ImplUndoManager.cxx
+++ b/chart2/source/controller/main/ImplUndoManager.cxx
@@ -144,7 +144,6 @@ OUString UndoElement::getActionString() const
return m_aActionString;
}
-// static
Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XModel > & xModel )
{
Reference< frame::XModel > xResult;
@@ -156,7 +155,6 @@ Reference< frame::XModel > UndoElement::cloneModel( const Reference< frame::XMod
return xResult;
}
-// static
void UndoElement::applyModelContentToModel(
Reference< frame::XModel > & xInOutModelToChange,
const Reference< frame::XModel > & xModelToCopyFrom,
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index e0a8078..895684e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -631,13 +631,11 @@ ObjectHierarchy::ObjectHierarchy(
ObjectHierarchy::~ObjectHierarchy()
{}
-// static
ObjectHierarchy::tOID ObjectHierarchy::getRootNodeOID()
{
return ObjectIdentifier( C2U( "ROOT" ) );
}
-// static
bool ObjectHierarchy::isRootNode( const ObjectHierarchy::tOID& rOID )
{
return ( rOID == ObjectHierarchy::getRootNodeOID() );
diff --git a/chart2/source/controller/main/SelectionHelper.cxx
b/chart2/source/controller/main/SelectionHelper.cxx
index 6cd6218..1b7e404 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -335,8 +335,6 @@ bool Selection::isAdditionalShapeSelected() const
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-
-//static
bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
, rtl::OUString& rOutName
, bool bGivenObjectMayBeResult )
@@ -370,7 +368,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
return true;
}
-//static
bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
, ObjectIdentifier& rOutObject
, bool bGivenObjectMayBeResult )
@@ -384,7 +381,6 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
return false;
}
-//static
bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
, const rtl::OUString& rNameOfSelectedObject
, const DrawViewWrapper& rDrawViewWrapper )
@@ -400,7 +396,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
return true;
}
-// static
::rtl::OUString SelectionHelper::getHitObjectCID(
const Point& rMPos,
DrawViewWrapper& rDrawViewWrapper,
@@ -466,7 +461,6 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
// \\- solar mutex
}
-//static
bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
, const uno::Reference< frame::XModel >& xChartModel )
{
@@ -489,7 +483,6 @@ SelectionHelper::~SelectionHelper()
{
}
-//virtual
bool SelectionHelper::getFrameDragSingles()
{
bool bFrameDragSingles = true;//true == green == surrounding handles
@@ -498,7 +491,6 @@ bool SelectionHelper::getFrameDragSingles()
return bFrameDragSingles;
}
-//static
SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
{
if(!pObj)
@@ -554,7 +546,6 @@ SdrObject* SelectionHelper::getObjectToMark()
return m_pMarkObj;
}
-//static
E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
{
//search wether the object or one of its children is a 3D object
@@ -591,7 +582,6 @@ E3dScene* SelectionHelper::getSceneToRotate( SdrObject* pObj )
}
-//virtual
bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
{
SolarMutexGuard aSolarGuard;
diff --git a/chart2/source/controller/main/UndoManager.cxx
b/chart2/source/controller/main/UndoManager.cxx
index aca9724..4975c0a 100644
--- a/chart2/source/controller/main/UndoManager.cxx
+++ b/chart2/source/controller/main/UndoManager.cxx
@@ -409,7 +409,6 @@ sal_Int64 UndoManager::getSomething( const Sequence< sal_Int8 >& rId )
return 0;
}
-// static
const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
{
static Sequence< sal_Int8 >* pSeq = 0;
@@ -426,7 +425,6 @@ const Sequence< sal_Int8 >& UndoManager::getUnoTunnelId()
return *pSeq;
}
-// static
UndoManager* UndoManager::getImplementation( const Reference< uno::XInterface > xObj )
{
UndoManager* pRet = NULL;
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7520e58..59d9c88 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -883,7 +883,6 @@ void ChartTypeTemplate::createChartTypes(
}
}
-//static
void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
const Sequence< Reference< XChartType > > & rOldChartTypesSeq,
const Reference< XChartType > & xNewChartType )
diff --git a/chart2/source/model/template/DataInterpreter.cxx
b/chart2/source/model/template/DataInterpreter.cxx
index 7c9517e..9768221 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -330,7 +330,6 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
// convenience methods
-// static
OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq )
{
OUString aResult;
@@ -349,7 +348,6 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq
return aResult;
}
-// static
void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, const OUString &
rRole )
{
if( ! xSeq.is())
@@ -365,7 +363,6 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co
}
}
-// static
uno::Any DataInterpreter::GetProperty(
const Sequence< beans::PropertyValue > & aArguments,
const OUString & rName )
@@ -378,7 +375,6 @@ uno::Any DataInterpreter::GetProperty(
return uno::Any();
}
-// static
bool DataInterpreter::HasCategories(
const Sequence< beans::PropertyValue > & rArguments,
const Sequence< Reference< data::XLabeledDataSequence > > & rData )
diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx
b/chart2/source/model/template/_serviceregistration_charttypes.cxx
index a7b8f4b..c671c28 100644
--- a/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ b/chart2/source/model/template/_serviceregistration_charttypes.cxx
@@ -131,7 +131,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] =
} // anonymous namespace
-// static
struct ::cppu::ImplementationEntry *
ChartTypeEntriesForServiceRegistration::getImplementationEntries()
{
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 53f3464..a3f47a1 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -65,19 +65,16 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-//static
Reference< chart2::XScaling > AxisHelper::createLinearScaling()
{
return new LinearScaling( 1.0, 0.0 );
}
-//static
Reference< chart2::XScaling > AxisHelper::createLogarithmicScaling( double fBase )
{
return new LogarithmicScaling( fBase );
}
-//static
ScaleData AxisHelper::createDefaultScale()
{
ScaleData aScaleData;
@@ -88,7 +85,6 @@ ScaleData AxisHelper::createDefaultScale()
return aScaleData;
}
-//static
void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
{
uno::Any aEmpty;
@@ -96,7 +92,6 @@ void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
rScaleData.Scaling = 0;
}
-//static
bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
{
bool bReturn = false;
@@ -106,7 +101,6 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
return bReturn;
}
-//static
Reference< XAxis > AxisHelper::createAxis(
sal_Int32 nDimensionIndex
, sal_Int32 nAxisIndex // 0==main or 1==secondary axis
@@ -174,7 +168,6 @@ Reference< XAxis > AxisHelper::createAxis(
return xAxis;
}
-//static
Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMainAxis
, const Reference< chart2::XDiagram >& xDiagram
, const Reference< uno::XComponentContext >& xContext
@@ -193,7 +186,6 @@ Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMain
nDimensionIndex, nAxisIndex, xCooSys, xContext, pRefSizeProvider );
}
-//static
void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
, const Reference< chart2::XDiagram >& xDiagram
, const Reference< uno::XComponentContext >& xContext
@@ -216,7 +208,6 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
AxisHelper::makeAxisVisible( xAxis );
}
-//static
void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
, const Reference< XDiagram >& xDiagram
, const Reference< uno::XComponentContext >& /*xContext*/ )
@@ -246,7 +237,6 @@ void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
}
}
-//static
void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
{
Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -258,7 +248,6 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
}
}
-//static
void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridProperties )
{
if( xGridProperties.is() )
@@ -268,14 +257,12 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >&
xGridP
}
}
-//static
void AxisHelper::hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis
, const Reference< XDiagram >& xDiagram )
{
AxisHelper::makeAxisInvisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
}
-//static
void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
{
Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -285,7 +272,6 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
}
}
-//static
void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, const Reference<
XDiagram >& xDiagram )
{
//axis is hidden if no data is attached anymore but data is available
@@ -329,7 +315,6 @@ void AxisHelper::hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
}
}
-//static
void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGridProperties )
{
if( xGridProperties.is() )
@@ -363,7 +348,6 @@ sal_Bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIn
return bRet;
}
-//static
Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
const Reference< XDiagram >& xDiagram, sal_Int32 nIndex )
{
@@ -376,7 +360,6 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
return NULL;
}
-//static
Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxis
, const Reference< XDiagram >& xDiagram )
{
@@ -392,7 +375,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxi
return xRet;
}
-//static
Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
, const Reference< XCoordinateSystem >& xCooSys )
{
@@ -408,7 +390,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAx
return xRet;
}
-//static
Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xAxis
, const Reference< XCoordinateSystem >& xCooSys )
{
@@ -430,7 +411,6 @@ Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xA
return AxisHelper::getAxis( nDimensionIndex, 0, xCooSys );
}
-//static
Reference< XAxis > AxisHelper::getParallelAxis( const Reference< XAxis >& xAxis
, const Reference< XDiagram >& xDiagram )
{
@@ -457,7 +437,6 @@ sal_Bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
return AxisHelper::isAxisVisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram )
);
}
-//static
sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
{
sal_Bool bRet = false;
@@ -483,7 +462,6 @@ sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet
return bRet;
}
-//static
sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGridProperies )
{
sal_Bool bRet = false;
@@ -497,7 +475,6 @@ sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGri
return bRet;
}
-//static
Reference< beans::XPropertySet > AxisHelper::getGridProperties(
const Reference< XCoordinateSystem >& xCooSys
, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex, sal_Int32 nSubGridIndex )
@@ -520,7 +497,6 @@ Reference< beans::XPropertySet > AxisHelper::getGridProperties(
return xRet;
}
-//static
sal_Int32 AxisHelper::getDimensionIndexOfAxis(
const Reference< XAxis >& xAxis
, const Reference< XDiagram >& xDiagram )
@@ -532,7 +508,6 @@ sal_Int32 AxisHelper::getDimensionIndexOfAxis(
return nDimensionIndex;
}
-//static
bool AxisHelper::getIndicesForAxis(
const Reference< XAxis >& xAxis
, const Reference< XCoordinateSystem >& xCooSys
@@ -565,7 +540,6 @@ bool AxisHelper::getIndicesForAxis(
return false;
}
-//static
bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Reference< XDiagram >&
xDiagram
, sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex )
{
@@ -592,7 +566,6 @@ bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Refer
return false;
}
-//static
std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
const Reference< XCoordinateSystem >& xCooSys
, bool bOnlyVisible /* = false */ )
@@ -639,7 +612,6 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
return aAxisVector;
}
-//static
Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
const Reference< XDiagram >& xDiagram
, bool bOnlyVisible )
@@ -661,7 +633,6 @@ Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
return ContainerHelper::ContainerToSequence( aAxisVector );
}
-//static
Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Reference< XDiagram >&
xDiagram )
{
Sequence< Reference< XAxis > > aAllAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -690,7 +661,6 @@ Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Refe
return ContainerHelper::ContainerToSequence( aGridVector );
}
-//static
void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityList
, const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
{
@@ -710,7 +680,6 @@ void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityL
rPossibilityList[nIndex] = rPossibilityList[nIndex-3];
}
-//static
bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& xCooSys )
{
Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
@@ -739,7 +708,6 @@ bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& x
return false;
}
-//static
bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
, const Reference< XCoordinateSystem >& xCooSys )
{
@@ -765,7 +733,6 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
return bRet;
}
-//static
void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
, const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
{
@@ -791,7 +758,6 @@ void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
}
}
-//static
bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
, const Sequence< sal_Bool >& rOldExistenceList
, const Sequence< sal_Bool >& rNewExistenceList
@@ -815,7 +781,6 @@ bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
return bChanged;
}
-//static
bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
, const Sequence< sal_Bool >& rOldExistenceList
, const Sequence< sal_Bool >& rNewExistenceList
@@ -836,7 +801,6 @@ bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
return bChanged;
}
-//static
Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis(
const Reference< XAxis >& xAxis
, const Reference< XDiagram >& xDiagram )
diff --git a/chart2/source/tools/CharacterProperties.cxx
b/chart2/source/tools/CharacterProperties.cxx
index c93a5c3..41d1c62 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -556,7 +556,6 @@ bool CharacterProperties::IsCharacterPropertyHandle( sal_Int32 nHandle )
nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
}
-// static
awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
const uno::Reference< beans::XMultiPropertySet > & xMultiPropSet )
{
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 2cb2748..224526c 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -55,21 +55,18 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-//static
uno::Reference< chart2::data::XRangeHighlighter > ChartModelHelper::createRangeHighlighter(
const uno::Reference< view::XSelectionSupplier > & xSelectionSupplier )
{
return new RangeHighlighter( xSelectionSupplier );
}
-//static
uno::Reference< chart2::data::XDataProvider > ChartModelHelper::createInternalDataProvider(
const uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, bool
bConnectToModel )
{
return new InternalDataProvider( xChartDoc, bConnectToModel );
}
-//static
uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< frame::XModel >&
xModel )
{
uno::Reference< XChartDocument > xChartDoc( xModel, uno::UNO_QUERY );
@@ -78,7 +75,6 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
return NULL;
}
-// static
uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
chart2::XChartDocument >& xChartDoc )
{
try
@@ -93,7 +89,6 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
return NULL;
}
-//static
uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( const
uno::Reference< frame::XModel >& xModel )
{
uno::Reference< XCoordinateSystem > XCooSys;
@@ -107,7 +102,6 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return XCooSys;
}
-// static
::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< XChartDocument > & xChartDoc )
{
@@ -120,7 +114,6 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return aResult;
}
-// static
::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< frame::XModel > & xModel )
{
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index fa78789..5c740ed 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -439,7 +439,6 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC
return sal_False;
}
-//static
sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::Reference<
chart2::XChartType >& xChartType )
{
sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey
@@ -460,7 +459,6 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::
return nRet;
}
-//static
sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno::Reference<
chart2::XChartType >& xChartType )
{
sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index c8b790a..e1b4b4a 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -46,7 +46,6 @@ namespace chart
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
-//static
void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >& xChartModel )
{
try
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx
b/chart2/source/tools/ColorPerPointHelper.cxx
index 62a4fa5..5501982 100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -43,7 +43,6 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-//static
bool ColorPerPointHelper::hasPointOwnColor(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xDataSeriesProperties
@@ -73,7 +72,6 @@ bool ColorPerPointHelper::hasPointOwnColor(
return false;
}
-// static
bool ColorPerPointHelper::hasPointOwnProperties(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xSeriesProperties
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index e56834e..eeaf613 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -74,7 +74,6 @@ using ::rtl::OUString;
namespace chart
{
-// static
DiagramHelper::tTemplateWithServiceName
DiagramHelper::getTemplateForDiagram(
const Reference< XDiagram > & xDiagram,
@@ -133,7 +132,6 @@ DiagramHelper::tTemplateWithServiceName
return aResult;
}
-// static
void DiagramHelper::setVertical(
const Reference< XDiagram > & xDiagram,
bool bVertical /* = true */ )
@@ -211,7 +209,6 @@ void DiagramHelper::setVertical(
}
}
-//static
bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDiagram,
bool& rbFound, bool& rbAmbiguous )
{
@@ -249,7 +246,6 @@ bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDia
return bValue;
}
-//static
void DiagramHelper::setStackMode(
const Reference< XDiagram > & xDiagram,
StackMode eStackMode,
@@ -341,8 +337,6 @@ void DiagramHelper::setStackMode(
}
}
-//static
-
StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, bool& rbFound,
bool& rbAmbiguous )
{
rbFound=false;
@@ -384,7 +378,6 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, b
return eGlobalStackMode;
}
-// static
StackMode DiagramHelper::getStackModeFromChartType(
const Reference< XChartType > & xChartType,
bool& rbFound, bool& rbAmbiguous,
@@ -468,7 +461,6 @@ StackMode DiagramHelper::getStackModeFromChartType(
return eStackMode;
}
-// static
sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
{
// -1: not yet set
@@ -501,7 +493,6 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
return nResult;
}
-// static
void DiagramHelper::setDimension(
const Reference< XDiagram > & xDiagram,
sal_Int32 nNewDimensionCount )
@@ -562,7 +553,6 @@ void DiagramHelper::setDimension(
}
}
-// static
void DiagramHelper::replaceCoordinateSystem(
const Reference< XDiagram > & xDiagram,
const Reference< XCoordinateSystem > & xCooSysToReplace,
@@ -598,7 +588,6 @@ void DiagramHelper::replaceCoordinateSystem(
}
}
-//static
bool DiagramHelper::isSeriesAttachedToMainAxis(
const uno::Reference< chart2::XDataSeries >& xDataSeries )
{
@@ -606,7 +595,6 @@ bool DiagramHelper::isSeriesAttachedToMainAxis(
return (nAxisIndex==0);
}
-//static
bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
, const uno::Reference< chart2::XDataSeries >& xDataSeries
, const uno::Reference< chart2::XDiagram >& xDiagram
@@ -652,7 +640,6 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
return bChanged;
}
-//static
uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
const uno::Reference< XDataSeries >& xSeries,
const uno::Reference< XDiagram >& xDiagram )
@@ -660,7 +647,6 @@ uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
return AxisHelper::getAxis( 1, DiagramHelper::isSeriesAttachedToMainAxis( xSeries ), xDiagram
);
}
-//static
uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
const uno::Reference< chart2::XDiagram >& xDiagram
, const uno::Reference< XDataSeries >& xGivenDataSeries )
@@ -710,7 +696,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
return 0;
}
-// static
::std::vector< Reference< XDataSeries > >
DiagramHelper::getDataSeriesFromDiagram(
const Reference< XDiagram > & xDiagram )
@@ -857,7 +842,6 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
} // anonymous namespace
-//static
bool DiagramHelper::isCategoryDiagram(
const Reference< XDiagram >& xDiagram )
{
@@ -896,7 +880,6 @@ bool DiagramHelper::isCategoryDiagram(
return false;
}
-// static
void DiagramHelper::setCategoriesToDiagram(
const Reference< chart2::data::XLabeledDataSequence >& xCategories,
const Reference< XDiagram >& xDiagram,
@@ -928,7 +911,6 @@ void DiagramHelper::setCategoriesToDiagram(
}
}
-// static
Reference< data::XLabeledDataSequence >
DiagramHelper::getCategoriesFromDiagram(
const Reference< XDiagram > & xDiagram )
@@ -1023,7 +1005,6 @@ Sequence< rtl::OUString >
DiagramHelper::generateAutomaticCategoriesFromCooSys(
return aRet;
}
-//static
Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
const Reference< XChartDocument >& xChartDoc )
{
@@ -1038,7 +1019,6 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
return aRet;
}
-// static
Sequence< Reference< XChartType > >
DiagramHelper::getChartTypesFromDiagram(
const Reference< XDiagram > & xDiagram )
@@ -1068,7 +1048,6 @@ Sequence< Reference< XChartType > >
return ContainerHelper::ContainerToSequence( aResult );
}
-//static
bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartType >& xFirstType,
const Reference< ::chart2::XChartType >& xSecondType )
{
@@ -1328,7 +1307,6 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
return false;
}
-// static
sal_Int32 DiagramHelper::getGeometry3D(
const uno::Reference< chart2::XDiagram > & xDiagram,
bool& rbFound, bool& rbAmbiguous )
@@ -1375,7 +1353,6 @@ sal_Int32 DiagramHelper::getGeometry3D(
return nCommonGeom;
}
-// static
void DiagramHelper::setGeometry3D(
const Reference< chart2::XDiagram > & xDiagram,
sal_Int32 nNewGeometry )
@@ -1391,7 +1368,6 @@ void DiagramHelper::setGeometry3D(
}
}
-//static
sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
const Reference< chart2::XDiagram > & xDiagram,
const Reference< chart2::XChartType >& xChartType )
@@ -1419,7 +1395,6 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
return nResult;
}
-//static
DiagramPositioningMode DiagramHelper::getDiagramPositioningMode( const uno::Reference<
chart2::XDiagram > & xDiagram )
{
@@ -1451,7 +1426,6 @@ void lcl_ensureRange0to1( double& rValue )
rValue=1.0;
}
-//static
bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >& xChartModel,
const awt::Rectangle& rPosRect /*100th mm*/ )
{
@@ -1497,7 +1471,6 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference<
frame::XModel >
return bChanged;
}
-//static
awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference< frame::XModel >&
xChartModel )
{
awt::Rectangle aRet(-1,-1,-1,-1);
@@ -1528,7 +1501,6 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const
uno::Reference
return aRet;
}
-//static
bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
const uno::Reference< frame::XModel >& xChartModel
, bool bResetModifiedState, bool bConvertAlsoFromAutoPositioning )
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 6916bc4..0752b2b 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -356,7 +356,6 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
return aRet;
}
-//static
Sequence< OUString > ExplicitCategoriesProvider::getExplicitSimpleCategories(
const SplitCategoriesProvider& rSplitCategoriesProvider )
{
@@ -402,7 +401,6 @@ std::vector< ComplexCategory > ExplicitCategoriesProvider::getCategoriesByLevel
return aRet;
}
-// static
OUString ExplicitCategoriesProvider::getCategoryByIndex(
const Reference< XCoordinateSystem >& xCooSysModel
, const uno::Reference< frame::XModel >& xChartModel
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 1038b56..7cf7c8e 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -137,7 +137,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
-//static
void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector<
::com::sun::star::beans::Property > & rOutProperties )
{
rOutProperties.push_back(
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 8e639f0..2809637 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -47,7 +47,6 @@ namespace chart
//.............................................................................
-//static
Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::XModel >& xModel
, const uno::Reference< uno::XComponentContext
& xContext )
{
@@ -79,7 +78,6 @@ Reference< chart2::XLegend > LegendHelper::showLegend( const Reference< frame::X
return xLegend;
}
-//static
void LegendHelper::hideLegend( const Reference< frame::XModel >& xModel )
{
uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( xModel, 0, false );
@@ -90,7 +88,6 @@ void LegendHelper::hideLegend( const Reference< frame::XModel >& xModel )
}
}
-// static
uno::Reference< chart2::XLegend > LegendHelper::getLegend(
const uno::Reference< frame::XModel >& xModel
, const uno::Reference< uno::XComponentContext >& xContext
@@ -128,7 +125,6 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend(
return xResult;
}
-// static
bool LegendHelper::hasLegend( const uno::Reference< chart2::XDiagram > & xDiagram )
{
bool bReturn = false;
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index 6b4e8be..c6f7365 100644
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -109,7 +109,6 @@ void LineProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINE_JOINT,
drawing::LineJoint_ROUND );
}
-//static
bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xLineProperties )
{
@@ -138,7 +137,6 @@ bool LineProperties::IsLineVisible( const ::com::sun::star::uno::Reference<
return bRet;
}
-//static
void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xLineProperties )
{
@@ -163,7 +161,6 @@ void LineProperties::SetLineVisible( const ::com::sun::star::uno::Reference<
}
}
-//static
void LineProperties::SetLineInvisible( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xLineProperties )
{
diff --git a/chart2/source/tools/NamedFillProperties.cxx
b/chart2/source/tools/NamedFillProperties.cxx
index 7cf93be..3faa883 100644
--- a/chart2/source/tools/NamedFillProperties.cxx
+++ b/chart2/source/tools/NamedFillProperties.cxx
@@ -94,7 +94,6 @@ void NamedFillProperties::AddDefaultsToMap(
{
}
-// static
OUString NamedFillProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
{
//will return e.g. "FillGradientName" for PROP_FILL_GRADIENT_NAME
diff --git a/chart2/source/tools/NamedLineProperties.cxx
b/chart2/source/tools/NamedLineProperties.cxx
index 2dc76ef..a9ac1aa 100644
--- a/chart2/source/tools/NamedLineProperties.cxx
+++ b/chart2/source/tools/NamedLineProperties.cxx
@@ -82,7 +82,6 @@ void NamedLineProperties::AddDefaultsToMap(
{
}
-// static
OUString NamedLineProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
{
//will return e.g. "LineDashName" for PROP_LINE_DASH_NAME
diff --git a/chart2/source/tools/NamedProperties.cxx b/chart2/source/tools/NamedProperties.cxx
index 9e8519d..3665792 100644
--- a/chart2/source/tools/NamedProperties.cxx
+++ b/chart2/source/tools/NamedProperties.cxx
@@ -48,7 +48,6 @@ void NamedProperties::AddPropertiesToVector(
NamedLineProperties::AddPropertiesToVector( rOutProperties );
}
-// static
OUString NamedProperties::GetPropertyNameForHandle( sal_Int32 nHandle )
{
OUString aName = NamedFillProperties::GetPropertyNameForHandle( nHandle );
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index fb98305..a392fc0 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -341,7 +341,6 @@ bool ObjectIdentifier::operator<( const ObjectIdentifier& rOID ) const
return bReturn;
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifierForObject(
const Reference< uno::XInterface >& xObject
, const Reference< frame::XModel >& xChartModel )
@@ -425,14 +424,12 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
return aRet;
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifierForParticle(
const OUString& rParticle )
{
return ObjectIdentifier::createClassifiedIdentifierForParticles( rParticle, OUString() );
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
const OUString& rParentParticle
, const OUString& rChildParticle
@@ -459,7 +456,6 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createParticleForDiagram(
const Reference< XDiagram >& /*xDiagram*/
, const Reference< frame::XModel >& /*xChartModel*/ )
@@ -469,7 +465,6 @@ OUString ObjectIdentifier::createParticleForDiagram(
return aRet;
}
-//static
OUString ObjectIdentifier::createParticleForCoordinateSystem(
const Reference< XCoordinateSystem >& xCooSys
, const Reference< frame::XModel >& xChartModel )
@@ -498,7 +493,6 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createParticleForAxis(
sal_Int32 nDimensionIndex
, sal_Int32 nAxisIndex )
@@ -512,7 +506,6 @@ OUString ObjectIdentifier::createParticleForAxis(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createParticleForGrid(
sal_Int32 nDimensionIndex
, sal_Int32 nAxisIndex )
@@ -526,7 +519,6 @@ OUString ObjectIdentifier::createParticleForGrid(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
const Reference< XAxis >& xAxis
, const Reference< frame::XModel >& xChartModel
@@ -545,7 +537,6 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
return aGridCID;
}
-//static
OUString ObjectIdentifier::createParticleForSeries(
sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
, sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex )
@@ -566,7 +557,6 @@ OUString ObjectIdentifier::createParticleForSeries(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createParticleForLegend(
const Reference< XLegend >& /*xLegend*/
, const Reference< frame::XModel >& xChartModel )
@@ -584,7 +574,6 @@ OUString ObjectIdentifier::createParticleForLegend(
return aRet.makeStringAndClear();
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifier(
enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
, const OUString& rParticleID )//e.g. SeriesID
@@ -593,7 +582,6 @@ OUString ObjectIdentifier::createClassifiedIdentifier(
eObjectType, rParticleID, m_aEmptyString );
}
-//static
OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
, const OUString& rParticleID //e.g. Point Index or SubGrid Index
@@ -620,13 +608,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierWithParent(
return aRet.makeStringAndClear();
}
-//static
const OUString& ObjectIdentifier::getPieSegmentDragMethodServiceName()
{
return m_aPieSegmentDragMethodServiceName;
}
-//static
OUString ObjectIdentifier::createPieSegmentDragParameterString(
sal_Int32 nOffsetPercent
, const awt::Point& rMinimumPosition
@@ -644,7 +630,6 @@ OUString ObjectIdentifier::createPieSegmentDragParameterString(
return aRet.makeStringAndClear();
}
-//static
bool ObjectIdentifier::parsePieSegmentDragParameterString(
const OUString& rDragParameterString
, sal_Int32& rOffsetPercent
@@ -682,7 +667,6 @@ bool ObjectIdentifier::parsePieSegmentDragParameterString(
return true;
}
-//static
OUString ObjectIdentifier::getDragMethodServiceName( const OUString& rCID )
{
OUString aRet;
@@ -708,7 +692,6 @@ OUString ObjectIdentifier::getDragMethodServiceName( const OUString& rCID )
return aRet;
}
-//static
OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
{
OUString aRet;
@@ -734,7 +717,6 @@ OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
return aRet;
}
-//static
bool ObjectIdentifier::isDragableObject( const OUString& rClassifiedIdentifier )
{
ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
@@ -769,7 +751,6 @@ bool ObjectIdentifier::isDragableObject()
return bReturn;
}
-//static
bool ObjectIdentifier::isRotateableObject( const OUString& rClassifiedIdentifier )
{
ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
@@ -784,7 +765,6 @@ bool ObjectIdentifier::isRotateableObject( const OUString& rClassifiedIdentifier
return false;
}
-//static
bool ObjectIdentifier::isMultiClickObject( const OUString& rClassifiedIdentifier )
{
//the name of a shape is it's ClassifiedIdentifier
@@ -847,7 +827,6 @@ bool ObjectIdentifier::areIdenticalObjects( const OUString& rCID1, const OUStrin
return false;
}
-//static
OUString ObjectIdentifier::getStringForType( ObjectType eObjectType )
{
OUString aRet;
@@ -934,7 +913,6 @@ OUString ObjectIdentifier::getStringForType( ObjectType eObjectType )
return aRet;
}
-//static
ObjectType ObjectIdentifier::getObjectType( const OUString& rCID )
{
ObjectType eRet;
@@ -1021,7 +999,6 @@ ObjectType ObjectIdentifier::getObjectType()
return eObjectType;
}
-//static
OUString ObjectIdentifier::createDataCurveCID(
const OUString& rSeriesParticle
, sal_Int32 nCurveIndex
@@ -1032,7 +1009,6 @@ OUString ObjectIdentifier::createDataCurveCID(
return createClassifiedIdentifierWithParent( eType, aParticleID, rSeriesParticle );
}
-//static
OUString ObjectIdentifier::createDataCurveEquationCID(
const OUString& rSeriesParticle
, sal_Int32 nCurveIndex )
@@ -1041,7 +1017,6 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID,
rSeriesParticle );
}
-//static
OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString&
rChildParticle )
{
OUStringBuffer aRet(rParticle);
@@ -1054,7 +1029,6 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle,
con
return aRet.makeStringAndClear();
}
-//static
rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32
nIndex )
{
OUStringBuffer aRet( getStringForType( eObjectType ) );
@@ -1066,7 +1040,6 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType
eObject
return aRet.makeStringAndClear();
}
-//static
sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID )
{
sal_Int32 nRet = -1;
@@ -1078,7 +1051,6 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString&
rPar
return nRet;
}
-//static
OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
, const rtl::OUString& rSeriesParticle
, const rtl::OUString& rDragMethodServiceName
@@ -1092,14 +1064,12 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType
eSubObjectType
, rDragMethodServiceName, rDragParameterString );
}
-//static
OUString ObjectIdentifier::createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex )
{
OUString aRet(rPointCID_Stub);
return aRet+=OUString::valueOf( nIndex );
}
-//static
OUString ObjectIdentifier::getParticleID( const OUString& rCID )
{
OUString aRet;
@@ -1109,7 +1079,6 @@ OUString ObjectIdentifier::getParticleID( const OUString& rCID )
return aRet;
}
-//static
OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
{
OUString aRet;
@@ -1128,7 +1097,6 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
return aRet;
}
-//static
OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
{
OUString aRet;
@@ -1144,7 +1112,6 @@ OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
return aRet;
}
-//static
bool ObjectIdentifier::isCID( const OUString& rName )
{
return rName.getLength() && rName.match( m_aProtocol );
@@ -1158,7 +1125,6 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
rObjectCID, Reference< frame::XModel >( xChartDocument, uno::UNO_QUERY ));
}
-//static
Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
@@ -1341,7 +1307,6 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
return xObjectProperties;
}
-//static
Reference< XAxis > ObjectIdentifier::getAxisForCID(
const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
@@ -1357,7 +1322,6 @@ Reference< XAxis > ObjectIdentifier::getAxisForCID(
return AxisHelper::getAxis( nDimensionIndex, nAxisIndex, xCooSys );
}
-//static
Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
@@ -1384,7 +1348,6 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
return xSeries;
}
-//static
Reference< XDiagram > ObjectIdentifier::getDiagramForCID(
const rtl::OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
@@ -1416,7 +1379,6 @@ TitleHelper::eTitleType ObjectIdentifier::getTitleTypeForCID( const OUString&
rC
return eRet;
}
-// static
OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
{
sal_Int32 nDiagramIndex = -1;
@@ -1431,7 +1393,6 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex,
nChartTypeIndex, nSeriesIndex );
}
-//static
OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward
)
{
sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID,
C2U("CID/D=") ) );
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx
b/chart2/source/tools/RegressionCurveCalculator.cxx
index 50966ef..77a7895 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -56,7 +56,6 @@ RegressionCurveCalculator::RegressionCurveCalculator() :
RegressionCurveCalculator::~RegressionCurveCalculator()
{}
-// static
bool RegressionCurveCalculator::isLinearScaling(
const Reference< chart2::XScaling > & xScaling )
{
@@ -68,7 +67,6 @@ bool RegressionCurveCalculator::isLinearScaling(
return (xServiceName.is() && xServiceName->getServiceName().equals( aLinScalingServiceName ));
}
-// static
bool RegressionCurveCalculator::isLogarithmicScaling(
const Reference< chart2::XScaling > & xScaling )
{
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx
b/chart2/source/tools/RegressionCurveHelper.cxx
index 07a4f5a..4abbf46 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -89,7 +89,6 @@ namespace chart
{
//.............................................................................
-// static
Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
const Reference< XComponentContext > & xContext )
{
@@ -97,7 +96,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
new MeanValueRegressionCurve( xContext ));
}
-// static
Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName(
const Reference< XComponentContext > & xContext,
::rtl::OUString aServiceName )
@@ -135,7 +133,6 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
// ------------------------------------------------------------
-// static
Reference< XRegressionCurveCalculator >
RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
::rtl::OUString aServiceName )
{
@@ -171,7 +168,6 @@ Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionC
return xResult;
}
-// static
void RegressionCurveHelper::initializeCurveCalculator(
const Reference< XRegressionCurveCalculator > & xOutCurveCalculator,
const Reference< data::XDataSource > & xSource,
@@ -236,7 +232,6 @@ void RegressionCurveHelper::initializeCurveCalculator(
xOutCurveCalculator->recalculateRegression( aXValues, aYValues );
}
-// static
void RegressionCurveHelper::initializeCurveCalculator(
const Reference< XRegressionCurveCalculator > & xOutCurveCalculator,
const Reference< XDataSeries > & xSeries,
@@ -252,7 +247,6 @@ void RegressionCurveHelper::initializeCurveCalculator(
// ----------------------------------------
-// static
bool RegressionCurveHelper::hasMeanValueLine(
const uno::Reference< XRegressionCurveContainer > & xRegCnt )
{
@@ -277,7 +271,6 @@ bool RegressionCurveHelper::hasMeanValueLine(
return false;
}
-// static
bool RegressionCurveHelper::isMeanValueLine(
const uno::Reference< chart2::XRegressionCurve > & xRegCurve )
{
@@ -289,7 +282,6 @@ bool RegressionCurveHelper::isMeanValueLine(
return false;
}
-// static
uno::Reference< chart2::XRegressionCurve >
RegressionCurveHelper::getMeanValueLine(
const uno::Reference< chart2::XRegressionCurveContainer > & xRegCnt )
@@ -315,7 +307,6 @@ uno::Reference< chart2::XRegressionCurve >
return uno::Reference< chart2::XRegressionCurve >();
}
-// static
void RegressionCurveHelper::addMeanValueLine(
uno::Reference< XRegressionCurveContainer > & xRegCnt,
const uno::Reference< XComponentContext > & xContext,
@@ -340,7 +331,6 @@ void RegressionCurveHelper::addMeanValueLine(
}
}
-// static
void RegressionCurveHelper::removeMeanValueLine(
Reference< XRegressionCurveContainer > & xRegCnt )
{
@@ -488,7 +478,6 @@ void RegressionCurveHelper::removeEquations(
}
}
-// static
void RegressionCurveHelper::replaceOrAddCurveAndReduceToOne(
tRegressionType eType,
uno::Reference< XRegressionCurveContainer > & xRegCnt,
@@ -511,7 +500,6 @@ void RegressionCurveHelper::replaceOrAddCurveAndReduceToOne(
}
}
-// static
uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveNotMeanValueLine(
const Reference< XRegressionCurveContainer > & xRegCnt )
{
@@ -539,7 +527,6 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN
return NULL;
}
-// static
RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
const Reference< XRegressionCurve > & xCurve )
{
@@ -587,7 +574,6 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
return eResult;
}
-// static
RegressionCurveHelper::tRegressionType RegressionCurveHelper::getFirstRegressTypeNotMeanValueLine(
const Reference< XRegressionCurveContainer > & xRegCnt )
{
@@ -651,7 +637,6 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
return aResult;
}
-// static
::std::vector< Reference< chart2::XRegressionCurve > >
RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine(
const Reference< chart2::XDiagram > & xDiagram )
@@ -677,7 +662,6 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
return aResult;
}
-// static
void RegressionCurveHelper::resetEquationPosition(
const Reference< chart2::XRegressionCurve > & xCurve )
{
diff --git a/chart2/source/tools/RelativePositionHelper.cxx
b/chart2/source/tools/RelativePositionHelper.cxx
index 61421d9..7d3b774 100644
--- a/chart2/source/tools/RelativePositionHelper.cxx
+++ b/chart2/source/tools/RelativePositionHelper.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
namespace chart
{
-// static
chart2::RelativePosition RelativePositionHelper::getReanchoredPosition(
const chart2::RelativePosition & rPosition,
const chart2::RelativeSize & rObjectSize,
@@ -133,7 +132,6 @@ chart2::RelativePosition RelativePositionHelper::getReanchoredPosition(
}
-// static
awt::Point RelativePositionHelper::getUpperLeftCornerOfAnchoredObject(
awt::Point aPoint
, awt::Size aObjectSize
@@ -192,7 +190,6 @@ awt::Point RelativePositionHelper::getUpperLeftCornerOfAnchoredObject(
return aResult;
}
-// static
awt::Point RelativePositionHelper::getCenterOfAnchoredObject(
awt::Point aPoint
, awt::Size aUnrotatedObjectSize
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index c724ea0..ef3eab0 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -46,7 +46,6 @@ using ::rtl::OUString;
namespace chart
{
-// static
double RelativeSizeHelper::calculate(
double fValue,
const Size & rOldReferenceSize,
@@ -62,7 +61,6 @@ double RelativeSizeHelper::calculate(
* fValue;
}
-// static
void RelativeSizeHelper::adaptFontSizes(
const Reference< XPropertySet > & xTargetProperties,
const Size & rOldReferenceSize,
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 269894b..bd1135a 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -182,7 +182,6 @@ void lcl_setXMLRangePropertyAtDataSequence(
namespace chart
{
-// static
double StatisticsHelper::getVariance(
const Sequence< double > & rData,
bool bUnbiasedEstimator /* = false */ )
@@ -191,7 +190,6 @@ double StatisticsHelper::getVariance(
return lcl_getVariance( rData, nValCount, bUnbiasedEstimator );
}
-// static
double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData )
{
double fResult = getVariance( rData );
@@ -201,7 +199,6 @@ double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData
return fResult;
}
-// static
double StatisticsHelper::getStandardError( const Sequence< double > & rData )
{
sal_Int32 nValCount;
@@ -222,7 +219,6 @@ double StatisticsHelper::getStandardError( const Sequence< double > & rData )
return fResult;
}
-// static
Reference< chart2::data::XLabeledDataSequence >
StatisticsHelper::getErrorLabeledDataSequenceFromDataSource(
const Reference< chart2::data::XDataSource > & xDataSource,
bool bPositiveValue,
@@ -241,7 +237,6 @@ Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorLabele
return xResult;
}
-// static
Reference< chart2::data::XDataSequence > StatisticsHelper::getErrorDataSequenceFromDataSource(
const Reference< chart2::data::XDataSource > & xDataSource,
bool bPositiveValue,
@@ -257,7 +252,6 @@ Reference< chart2::data::XDataSequence > StatisticsHelper::getErrorDataSequenceF
return xLSeq->getValues();
}
-// static
double StatisticsHelper::getErrorFromDataSource(
const Reference< chart2::data::XDataSource > & xDataSource,
sal_Int32 nIndex,
@@ -287,7 +281,6 @@ double StatisticsHelper::getErrorFromDataSource(
return fResult;
}
-// static
void StatisticsHelper::setErrorDataSequence(
const Reference< chart2::data::XDataSource > & xDataSource,
const Reference< chart2::data::XDataProvider > & xDataProvider,
@@ -319,7 +312,6 @@ void StatisticsHelper::setErrorDataSequence(
}
}
-// static
Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
const Reference< chart2::XDataSeries > & xDataSeries,
const Reference< uno::XComponentContext > & xContext,
@@ -349,7 +341,6 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars(
return xErrorBar;
}
-// static
Reference< beans::XPropertySet > StatisticsHelper::getErrorBars(
const Reference< chart2::XDataSeries > & xDataSeries,
bool bYError /* = true */ )
@@ -364,7 +355,6 @@ Reference< beans::XPropertySet > StatisticsHelper::getErrorBars(
return xErrorBar;
}
-// static
bool StatisticsHelper::hasErrorBars(
const Reference< chart2::XDataSeries > & xDataSeries,
bool bYError /* = true */ )
@@ -377,7 +367,6 @@ bool StatisticsHelper::hasErrorBars(
nStyle != ::com::sun::star::chart::ErrorBarStyle::NONE );
}
-// static
void StatisticsHelper::removeErrorBars(
const Reference< chart2::XDataSeries > & xDataSeries,
bool bYError /* = true */ )
@@ -388,7 +377,6 @@ void StatisticsHelper::removeErrorBars(
::com::sun::star::chart::ErrorBarStyle::NONE ));
}
-// static
bool StatisticsHelper::usesErrorBarRanges(
const Reference< chart2::XDataSeries > & xDataSeries,
bool bYError /* = true */ )
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 9ac262c..b7e63bc 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -1173,7 +1173,6 @@ void ThreeDHelper::setCameraDistance(
}
}
-//static
double ThreeDHelper::CameraDistanceToPerspective( double fCameraDistance )
{
double fRet = fCameraDistance;
@@ -1189,7 +1188,6 @@ double ThreeDHelper::CameraDistanceToPerspective( double fCameraDistance )
return fRet;
}
-//static
double ThreeDHelper::PerspectiveToCameraDistance( double fPerspective )
{
double fRet = fPerspective;
@@ -1205,7 +1203,6 @@ double ThreeDHelper::PerspectiveToCameraDistance( double fPerspective )
return fRet;
}
-//static
ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& xDiagram )
{
ThreeDLookScheme aScheme = ThreeDLookScheme_Unknown;
@@ -1279,7 +1276,6 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram,
ThreeD
}
-//static
void ThreeDHelper::set3DSettingsToDefault( const uno::Reference< beans::XPropertySet >&
xSceneProperties )
{
Reference< beans::XPropertyState > xState( xSceneProperties, uno::UNO_QUERY );
@@ -1292,7 +1288,6 @@ void ThreeDHelper::set3DSettingsToDefault( const uno::Reference<
beans::XPropert
ThreeDHelper::setDefaultIllumination( xSceneProperties );
}
-//static
void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >&
xSceneProperties, bool bPieOrDonut )
{
if( !xSceneProperties.is() )
@@ -1308,14 +1303,12 @@ void ThreeDHelper::setDefaultRotation( const uno::Reference<
beans::XPropertySet
uno::makeAny( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aSceneRotation )));
}
-//static
void ThreeDHelper::setDefaultRotation( const uno::Reference< beans::XPropertySet >&
xSceneProperties )
{
bool bPieOrDonut( DiagramHelper::isPieOrDonutChart( uno::Reference< XDiagram
(xSceneProperties, uno::UNO_QUERY) ) );
ThreeDHelper::setDefaultRotation( xSceneProperties, bPieOrDonut );
}
-//static
void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropertySet >&
xSceneProperties )
{
if( !xSceneProperties.is() )
@@ -1342,7 +1335,6 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference<
beans::XPropert
lcl_setLightsForScheme( xSceneProperties, aScheme );
}
-//static
void ThreeDHelper::getRoundedEdgesAndObjectLines(
const uno::Reference< XDiagram > & xDiagram
, sal_Int32& rnRoundedEdges, sal_Int32& rnObjectLines )
@@ -1442,7 +1434,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
ASSERT_EXCEPTION( e );
}
}
-//static
+
void ThreeDHelper::setRoundedEdgesAndObjectLines(
const uno::Reference< XDiagram > & xDiagram
, sal_Int32 nRoundedEdges, sal_Int32 nObjectLines )
@@ -1472,7 +1464,6 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
}
}
-//static
CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( const
Reference< beans::XPropertySet >& xSceneProperties )
{
CuboidPlanePosition eRet(CuboidPlanePosition_Left);
@@ -1489,7 +1480,6 @@ CuboidPlanePosition
ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeft
return eRet;
}
-//static
CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBackWall( const
Reference< beans::XPropertySet >& xSceneProperties )
{
CuboidPlanePosition eRet(CuboidPlanePosition_Back);
@@ -1506,7 +1496,6 @@ CuboidPlanePosition
ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBack
return eRet;
}
-//static
CuboidPlanePosition ThreeDHelper::getAutomaticCuboidPlanePositionForStandardBottom( const
Reference< beans::XPropertySet >& xSceneProperties )
{
CuboidPlanePosition eRet(CuboidPlanePosition_Bottom);
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx
b/chart2/source/tools/WrappedIgnoreProperty.cxx
index fd5167f..d1459ab 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -93,7 +93,6 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
: beans::PropertyState_DIRECT_VALUE );
}
-//static
void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( C2U( "LineStyle" ), uno::makeAny(
drawing::LineStyle_SOLID ) ) );
@@ -105,14 +104,12 @@ void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector<
WrappedPrope
rList.push_back( new WrappedIgnoreProperty( C2U( "LineJoint" ), uno::makeAny(
drawing::LineJoint_ROUND ) ) );
}
-//static
void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedProperty* >& rList )
{
addIgnoreFillProperties_without_BitmapProperties( rList );
addIgnoreFillProperties_only_BitmapProperties( rList );
}
-//static
void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector<
WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( C2U( "FillStyle" ), uno::makeAny(
drawing::FillStyle_SOLID ) ) );
@@ -127,7 +124,6 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
rList.push_back( new WrappedIgnoreProperty( C2U( "FillBackground" ), uno::makeAny(
sal_Bool(sal_False) ) ) );
}
-//static
void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector<
WrappedProperty* >& rList )
{
// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapName" ), uno::makeAny(
::rtl::OUString() ) ) );
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 27a49b7..2973eb5 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -58,7 +58,6 @@ const OUString& WrappedProperty::getOuterName() const
return m_aOuterName;
}
-//virtual
::rtl::OUString WrappedProperty::getInnerName() const
{
return m_aInnerName;
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
index aa616ca..5be4f14 100644
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/chart2/source/view/axes/TickmarkHelper.cxx
@@ -340,7 +340,6 @@ TickInfo* EquidistantTickIter::nextInfo()
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement
)
{
//the returned value will be <= fMin and on a Major Tick given by rIncrement
@@ -359,7 +358,7 @@ double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncreme
}
return fRet;
}
-//static
+
double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncrementData& rIncrement
)
{
//the returned value will be >= fMax and on a Major Tick given by rIncrement
@@ -782,7 +781,6 @@ bool TickmarkHelper_2D::isVerticalAxis() const
return ( m_aAxisStartScreenPosition2D.getX() == m_aAxisEndScreenPosition2D.getX() );
}
-//static
sal_Int32 TickmarkHelper_2D::getTickScreenDistance( TickIter& rIter )
{
//return the positive distance between the two first tickmarks in screen values
diff --git a/chart2/source/view/axes/VAxisProperties.cxx
b/chart2/source/view/axes/VAxisProperties.cxx
index 8ada4f5..fa533f5 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -158,7 +158,6 @@ TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories(
return aTickmarkProperties;
}
-//static
TickmarkProperties AxisProperties::getBiggestTickmarkProperties()
{
TickmarkProperties aTickmarkProperties;
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 5aaf8cb..ecb3511 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -193,7 +193,6 @@ VCartesianGrid::~VCartesianGrid()
m_pPosHelper = NULL;
}
-//static
void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>&
rLinePropertiesList
, const Sequence< Reference< beans::XPropertySet > > &
rGridPropertiesList )
{
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index 5a654f5..0cef224 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -62,7 +62,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-//static
VCoordinateSystem* VCoordinateSystem::createCoordinateSystem(
const Reference< XCoordinateSystem >& xCooSysModel )
{
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 3ae6ff3..d71fea3 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -77,7 +77,6 @@ void VPolarGrid::getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::st
aTickmarkHelper.getAllTicks( rAllTickInfos );
}
-//static
void VPolarGrid::createLinePointSequence_ForAngleAxis(
drawing::PointSequenceSequence& rPoints
, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 011c6ea..27cd04b 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -761,7 +761,6 @@ void lcl_AddErrorBottomLine( const drawing::Position3D& rPosition, ::basegfx::B2
} // anonymous namespace
-// virtual
void VSeriesPlotter::createErrorBar(
const uno::Reference< drawing::XShapes >& xTarget
, const drawing::Position3D& rUnscaledLogicPosition
@@ -882,7 +881,6 @@ void VSeriesPlotter::createErrorBar(
}
-// virtual
void VSeriesPlotter::createErrorBar_Y( const drawing::Position3D& rUnscaledLogicPosition
, VDataSeries& rVDataSeries, sal_Int32 nPointIndex
, const uno::Reference< drawing::XShapes >& xTarget )
@@ -2071,7 +2069,6 @@ std::vector< ViewLegendEntry > SAL_CALL
VSeriesPlotter::createLegendEntriesForCh
return std::vector< ViewLegendEntry >();
}
-//static
VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
const uno::Reference<XChartType>& xChartTypeModel
, sal_Int32 nDimensionCount
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index ba4bfeb..5d6ebb2 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -244,7 +244,6 @@ SfxMapUnit ChartItemPool::GetMetric(USHORT /* nWhich */) const
return SFX_MAPUNIT_100TH_MM;
}
-// static
SfxItemPool* ChartItemPool::CreateChartItemPool()
{
return new ChartItemPool();
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 7277cec..616afe7 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -118,7 +118,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
using rtl::OUString;
-//static
const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -135,7 +134,6 @@ const uno::Sequence<sal_Int8>& ExplicitValueProvider::getUnoTunnelId()
return *pSeq;
}
-//static
ExplicitValueProvider* ExplicitValueProvider::getExplicitValueProvider(
const Reference< uno::XInterface >& xChartView )
{
@@ -1927,7 +1925,6 @@ sal_Int32 lcl_getExplicitNumberFormatKeyForAxis(
return nNumberFormatKey;
}
-//static
sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
const Reference< chart2::XAxis >& xAxis
, const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem
@@ -1937,7 +1934,6 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
, true /*bSearchForParallelAxisIfNothingIsFound*/ );
}
-//static
sal_Int32 ExplicitValueProvider::getPercentNumberFormat( const Reference<
util::XNumberFormatsSupplier >& xNumberFormatsSupplier )
{
sal_Int32 nRet=-1;
@@ -2016,7 +2012,6 @@ sal_Int32
ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe
return nFormat;
}
-//static
awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
const Reference< frame::XModel >& xChartModel
, const Reference< uno::XInterface >& xChartView
@@ -2084,7 +2079,6 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
return aRet;
}
-//static
awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
const Reference< frame::XModel >& xChartModel
, const Reference< uno::XInterface >& xChartView
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx
b/chart2/source/view/main/DrawModelWrapper.cxx
index d004c1a..83e0971 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -371,7 +371,6 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName )
return getNamedSdrObject( rName, GetPage(0) );
}
-//static
SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObjList* pSearchList )
{
if(!pSearchList || rObjectCID.Len()==0)
@@ -391,7 +390,6 @@ SdrObject* DrawModelWrapper::getNamedSdrObject( const String& rObjectCID, SdrObj
return 0;
}
-//static
bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xShape )
{
uno::Reference< container::XChild > xChild( xShape, uno::UNO_QUERY );
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx
b/chart2/source/view/main/LabelPositionHelper.cxx
index 41aab5d..18b2f4f 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -68,7 +68,6 @@ awt::Point LabelPositionHelper::transformSceneToScreenPosition( const drawing::P
rScenePosition3D, m_xLogicTarget, m_pShapeFactory, m_nDimensionCount );
}
-//static
void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence&
rPropNames, LabelAlignment eAlignment)
{
//HorizontalAdjustment
@@ -108,7 +107,6 @@ void lcl_doDynamicFontResize( uno::Any* pAOldAndNewFontHeightAny
}
}
-//static
void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues
, const tNameSequence& rPropNames
, const uno::Reference< beans::XPropertySet >& xAxisModelProps
@@ -432,7 +430,6 @@ void lcl_correctRotation_Right_Bottom( double& rfXCorrection, double& rfYCorrect
}//end anonymous namespace
-//static
void LabelPositionHelper::correctPositionForRotation( const uno::Reference< drawing::XShape >&
xShape2DText
, LabelAlignment eLabelAlignment, const double fRotationAngle, bool
bRotateAroundCenter )
{
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx
b/chart2/source/view/main/PlottingPositionHelper.cxx
index a5218e6..3f2d748 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -199,7 +199,6 @@ drawing::Position3D PlottingPositionHelper::transformScaledLogicToScene(
return SequenceToPosition3D(aSeq);
}
-//static
awt::Point PlottingPositionHelper::transformSceneToScreenPosition( const drawing::Position3D&
rScenePosition3D
, const uno::Reference< drawing::XShapes >& xSceneTarget
, ShapeFactory* pShapeFactory
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index eb20689..283f20c 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -59,7 +59,6 @@ void lcl_overwriteOrAppendValues(
} // anonymous namespace
-//static
void PropertyMapper::setMappedProperties(
const uno::Reference< beans::XPropertySet >& xTarget
, const uno::Reference< beans::XPropertySet >& xSource
@@ -174,7 +173,6 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
, bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") );
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
{
//shape property -- chart model object property
@@ -241,7 +239,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
return m_aShapePropertyMapForCharacterProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProperties()
{
//shape property -- chart model object property
@@ -258,7 +255,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForParagraphProper
return m_aShapePropertyMapForParagraphProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties()
{
//shape property -- chart model object property
@@ -287,7 +283,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillProperties(
return m_aShapePropertyMapForFillProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties()
{
//shape property -- chart model object property
@@ -303,7 +298,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineProperties(
return m_aShapePropertyMapForLineProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillAndLineProperties()
{
static tMakePropertyNameMap m_aShapePropertyMapForFillAndLineProperties =
@@ -315,7 +309,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFillAndLineProp
return m_aShapePropertyMapForFillAndLineProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProperties()
{
static tMakePropertyNameMap m_aShapePropertyMapForTextShapeProperties =
@@ -327,7 +320,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProper
return m_aShapePropertyMapForTextShapeProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesProperties()
{
//shape property -- chart model object property
@@ -343,7 +335,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
return m_aShapePropertyMapForLineSeriesProperties;
}
-//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesProperties()
{
//shape property -- chart model object property
@@ -379,7 +370,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
return m_aShapePropertyMapForFilledSeriesProperties;
}
-// static
void PropertyMapper::setMultiProperties(
const tNameSequence& rNames
, const tAnySequence& rValues
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index dca76c9..5b143b0 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -79,7 +79,6 @@ namespace chart
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//static
void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
, const rtl::OUString& rName )
{
@@ -103,7 +102,6 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
//-----------------------------------------------------------------------------
-//static
rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
{
rtl::OUString aRet;
@@ -1960,7 +1958,6 @@ uno::Reference< drawing::XShape >
return xShape;
}
-//static
rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked )
{
sal_Int32 nLen = rString.getLength();
@@ -1981,7 +1978,6 @@ rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString,
bool
return aStackStr.makeStringAndClear();
}
-//static
bool ShapeFactory::hasPolygonAnyLines( drawing::PolyPolygonShape3D& rPoly)
{
// #i67757# check all contained polygons, if at least one polygon contains 2 or more points,
return true
@@ -1991,7 +1987,6 @@ bool ShapeFactory::hasPolygonAnyLines( drawing::PolyPolygonShape3D& rPoly)
return false;
}
-//static
bool ShapeFactory::isPolygonEmptyOrSinglePoint( drawing::PolyPolygonShape3D& rPoly)
{
// true, if empty polypolygon or one polygon with one point
@@ -1999,7 +1994,6 @@ bool ShapeFactory::isPolygonEmptyOrSinglePoint( drawing::PolyPolygonShape3D&
rPo
((rPoly.SequenceX.getLength() == 1) && (rPoly.SequenceX[0].getLength() <= 1));
}
-//static
void ShapeFactory::closePolygon( drawing::PolyPolygonShape3D& rPoly)
{
DBG_ASSERT( rPoly.SequenceX.getLength() <= 1, "ShapeFactory::closePolygon - single polygon
expected" );
@@ -2010,7 +2004,6 @@ void ShapeFactory::closePolygon( drawing::PolyPolygonShape3D& rPoly)
AddPointToPoly( rPoly, aFirst );
}
-//static
awt::Size ShapeFactory::calculateNewSizeRespectingAspectRatio(
const awt::Size& rTargetSize
, const awt::Size& rSourceSizeWithCorrectAspectRatio )
@@ -2026,7 +2019,6 @@ awt::Size ShapeFactory::calculateNewSizeRespectingAspectRatio(
return aNewSize;
}
-//static
awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
const awt::Point& rTargetAreaPosition
, const awt::Size& rTargetAreaSize
@@ -2038,7 +2030,6 @@ awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
return aNewPosition;
}
-//static
::basegfx::B2IRectangle ShapeFactory::getRectangleOfShape(
const uno::Reference< drawing::XShape >& xShape )
{
@@ -2054,7 +2045,6 @@ awt::Point ShapeFactory::calculateTopLeftPositionToCenterObject(
}
-//static
awt::Size ShapeFactory::getSizeAfterRotation(
const uno::Reference< drawing::XShape >& xShape, double fRotationAngleDegree )
{
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7ab8a67..29560e4 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -652,7 +652,6 @@ void VLegend::setDefaultWritingMode( sal_Int16 nDefaultWritingMode )
// ----------------------------------------
-// static
bool VLegend::isVisible( const Reference< XLegend > & xLegend )
{
if( ! xLegend.is())
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx
b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 825ce2c..485cc49 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -105,7 +105,6 @@ void lcl_setPropetiesToShape(
namespace chart
{
-// static
Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
const Reference< drawing::XShapes > xSymbolContainer,
chart2::LegendSymbolStyle eStyle,
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 8fbaced..9c0249a 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -56,7 +56,6 @@ ScDatabaseDocUtil::StrData::StrData() :
// ----------------------------------------------------------------------------
-// static
void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
const uno::Reference<sdbc::XRow>& xRow, long nRowPos,
long nType, BOOL bCurrency, StrData* pStrData )
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index f8e2b97..7100aac 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -630,7 +630,7 @@ void ScDocumentPool::Remove( const SfxPoolItem& rItem )
SfxItemPool::Remove( rItem );
}
-void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static
+void ScDocumentPool::CheckRef( const SfxPoolItem& rItem )
{
ULONG nRef = rItem.GetRefCount();
if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF )
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d2ff9bc..33e5b83 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1219,7 +1219,6 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine)
// ----------------------------------------------------------------------------
-// static
ScRecursionHelper* ScDocument::CreateRecursionHelperInstance()
{
return new ScRecursionHelper;
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 4454cfb..b4ebf89 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1002,7 +1002,6 @@ void ScDocument::GetAutoFormatData(SCTAB nTab, SCCOL nStartCol, SCROW
nStartRow,
}
}
-// static
void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW& rRow )
{
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index b509008..782340b 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2134,7 +2134,6 @@ bool hasFieldColumn(const vector<PivotField>* pRefFields, SCCOL nCol)
}
-// static
void ScDPObject::ConvertOrientation(
ScDPSaveData& rSaveData, const vector<PivotField>& rFields, USHORT nOrient,
const Reference<XDimensionsSupplier>& xSource,
@@ -2240,7 +2239,6 @@ void ScDPObject::ConvertOrientation(
}
}
-// static
bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags )
{
bool bAllowed = true;
@@ -2268,7 +2266,6 @@ bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags )
// -----------------------------------------------------------------------
-// static
BOOL ScDPObject::HasRegisteredSources()
{
BOOL bFound = FALSE;
@@ -2286,7 +2283,6 @@ BOOL ScDPObject::HasRegisteredSources()
return bFound;
}
-// static
uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
{
uno::Sequence<rtl::OUString> aSeq(0);
@@ -2332,7 +2328,6 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources()
// use getContext from addincol.cxx
uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiServiceFactory> xMSF);
-// static
uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc )
{
rtl::OUString aImplName = rDesc.aServiceName;
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index b990077..1a39b91 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1637,7 +1637,6 @@ String lcl_GetDataFieldName( const String& rSourceName,
sheet::GeneralFunction e
return aRet;
}
-// static
void ScDPOutput::GetDataDimensionNames( String& rSourceName, String& rGivenName,
const uno::Reference<uno::XInterface>& xDim )
{
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 556be30..3315574 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -3315,7 +3315,6 @@ ScDPDataMember* ScDPResultDimension::GetRowReferenceMember( const
ScDPRelativePo
return pColMember;
}
-// static
ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePos* pRelativePos,
const String* pName,
long nRefDimPos, const ScDPRunningTotalState& rRunning )
{
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 733964a..5bd1043 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1649,7 +1649,6 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj )
}
}
-// static
void ScDrawLayer::MirrorRectRTL( Rectangle& rRect )
{
// mirror and swap left/right
@@ -1699,7 +1698,6 @@ Rectangle ScDrawLayer::GetCellRect( ScDocument& rDoc, const ScAddress& rPos,
boo
return aCellRect;
}
-// static
String ScDrawLayer::GetVisibleName( SdrObject* pObj )
{
String aName = pObj->GetName();
@@ -1826,7 +1824,7 @@ ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj )
return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL;
}
-ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static
+ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate )
{
USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
for( USHORT i = 0; i < nCount; i++ )
@@ -1845,7 +1843,7 @@ ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate )
// stat
return 0;
}
-ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* pObj, SCTAB nTab ) // static
+ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* pObj, SCTAB nTab )
{
ScDrawObjData* pData = GetObjData( pObj );
if ( pData )
@@ -1870,7 +1868,7 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab )
return (pData && pData->mbNote) ? pData : 0;
}
-ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
+ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )
{
USHORT nCount = pObj->GetUserDataCount();
for( USHORT i = 0; i < nCount; i++ )
@@ -1883,7 +1881,6 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )
// static
return NULL;
}
-// static:
IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
const Point& rWinPoint, const Window& rCmpWnd )
{
@@ -1949,7 +1946,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj,
return pIMapObj;
}
-ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static
+ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )
{
USHORT nCount = pObj->GetUserDataCount();
for( USHORT i = 0; i < nCount; i++ )
@@ -1968,7 +1965,7 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )
return 0;
}
-void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
+void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist)
{
DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach");
pGlobalDrawPersist = pPersist;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3facc3b..9b00b3f 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -220,7 +220,6 @@ ULONG ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter& rFormatter
}
-// static
SvNumberFormatter* ScGlobal::GetEnglishFormatter()
{
if ( !pEnglishFormatter )
@@ -685,7 +684,6 @@ void ScGlobal::Clear()
//------------------------------------------------------------------------
-// static
CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
{
// new TextEncoding values
@@ -711,7 +709,6 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet )
//------------------------------------------------------------------------
-// static
String ScGlobal::GetCharsetString( CharSet eVal )
{
const sal_Char* pChar;
@@ -770,7 +767,6 @@ void ScGlobal::ResetFunctionList()
//------------------------------------------------------------------------
-// static
ScUnitConverter* ScGlobal::GetUnitConverter()
{
if ( !pUnitConverter )
@@ -782,7 +778,6 @@ ScUnitConverter* ScGlobal::GetUnitConverter()
//------------------------------------------------------------------------
-// static
const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr,
sal_Unicode c )
{
diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx
index 4a7d9c8..cce88a1 100644
--- a/sc/source/core/data/globalx.cxx
+++ b/sc/source/core/data/globalx.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-// static
void ScGlobal::InitAddIns()
{
// multi paths separated by semicolons
@@ -135,7 +134,6 @@ void ScGlobal::InitAddIns()
}
-// static
String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber)
{
if (!xOrdinalSuffix.is())
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index c6d4940..d35eab4 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -40,7 +40,6 @@
// -----------------------------------------------------------------------
-// static
rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent)
{
if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT)
@@ -62,7 +61,6 @@ rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent)
return rtl::OUString::createFromAscii(aEventNames[nEvent]);
}
-// static
sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent)
{
using namespace ::com::sun::star::script::vba::VBAEventId;
@@ -85,7 +83,6 @@ sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent)
return nVbaEventIds[nEvent];
}
-// static
sal_Int32 ScSheetEvents::GetVbaDocumentEventId(sal_Int32 nEvent)
{
using namespace ::com::sun::star::script::vba::VBAEventId;
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 91fcb31..d323027 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -911,7 +911,6 @@ inline void ScInterpreter::TreatDoubleError( double& rVal )
}
-// static
inline double ScInterpreter::div( const double& fNumerator, const double& fDenominator )
{
return (fDenominator != 0.0) ? (fNumerator / fDenominator) :
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 1970c30..d58f428 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1309,7 +1309,6 @@ BOOL ScUnoAddInCollection::FillFunctionDesc( long nFunc, ScFuncDesc& rDesc )
return FillFunctionDescFromData( rFuncData, rDesc );
}
-// static
BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData,
ScFuncDesc& rDesc )
{
rDesc.Clear();
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index 3832d50..71b3d72 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -54,7 +54,6 @@ List ScAddInListener::aAllListeners;
//------------------------------------------------------------------------
-// static
ScAddInListener* ScAddInListener::CreateListener(
uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc )
{
@@ -81,7 +80,6 @@ ScAddInListener::~ScAddInListener()
delete pDocs;
}
-// static
ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xVR )
{
sheet::XVolatileResult* pComp = xVR.get();
@@ -97,7 +95,6 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV
}
//! move to some container object?
-// static
void ScAddInListener::RemoveDocument( ScDocument* pDocumentP )
{
ULONG nPos = aAllListeners.Count();
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index ed8ebc7..e12cd1a 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -56,9 +56,6 @@
const sal_Char *linker_dummy = "";
-// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen)
-//static const sal_Char cStandardName[] = "Standard";
-
static const sal_Char sAutoTblFmtName[] = "autotbl.fmt";
// bis SO5PF
diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 441b18f..fe11fcc 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -126,13 +126,11 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB
nDestTab, S
}//end anonymous namespace
// === ScChartHelper ======================================
-//static
USHORT ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc )
{
return lcl_DoUpdateCharts( ScAddress(), pDoc, TRUE );
}
-//static
void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument*
pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab )
{
if( !pSrcDoc || !pDestDoc )
@@ -173,7 +171,6 @@ void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc,
}
}
-//static
uno::Reference< chart2::XChartDocument > ScChartHelper::GetChartFromSdrObject( SdrObject* pObject )
{
uno::Reference< chart2::XChartDocument > xReturn;
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 8ba2807..329b934 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1744,7 +1744,6 @@ BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack,
}
-// static
void ScChangeActionContent::GetStringOfCell( String& rStr,
const ScBaseCell* pCell, const ScDocument* pDoc, const ScAddress& rPos )
{
@@ -1760,7 +1759,6 @@ void ScChangeActionContent::GetStringOfCell( String& rStr,
}
-// static
void ScChangeActionContent::GetStringOfCell( String& rStr,
const ScBaseCell* pCell, const ScDocument* pDoc, ULONG nFormat )
{
@@ -1793,7 +1791,6 @@ void ScChangeActionContent::GetStringOfCell( String& rStr,
}
-// static
ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const ScBaseCell* pCell )
{
if ( pCell )
@@ -1829,14 +1826,12 @@ ScChangeActionContentCellType ScChangeActionContent::GetContentCellType(
const S
}
-// static
BOOL ScChangeActionContent::NeedsNumberFormat( const ScBaseCell* pCell )
{
return pCell && pCell->GetCellType() == CELLTYPE_VALUE;
}
-// static
void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
const ScAddress& rPos, const ScBaseCell* pOrgCell,
const ScDocument* pFromDoc, ScDocument* pToDoc )
@@ -1845,8 +1840,6 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
SetValue( rStr, pCell, nFormat, pOrgCell, pFromDoc, pToDoc );
}
-
-// static
void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
ULONG nFormat, const ScBaseCell* pOrgCell,
const ScDocument* pFromDoc, ScDocument* pToDoc )
@@ -1880,7 +1873,6 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell,
}
-// static
void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell,
ULONG nFormat, const ScDocument* pDoc )
{
@@ -2212,7 +2204,6 @@ const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot();
const SCSIZE ScChangeTrack::nContentSlots =
(MAXROWCOUNT) / InitContentRowsPerSlot() + 2;
-// static
SCROW ScChangeTrack::InitContentRowsPerSlot()
{
const SCSIZE nMaxSlots = 0xffe0 / sizeof( ScChangeActionContent* ) - 2;
@@ -2726,7 +2717,6 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange,
}
-// static
BOOL ScChangeTrack::IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell,
const ScBaseCell* pNewCell )
{
@@ -3338,7 +3328,6 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge )
}
-// static
BOOL ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, ULONG nFirstMerge )
{
if ( rAction.IsRejected() )
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 0bcc4f4..a71b28e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -288,7 +288,6 @@ void dbg_call_generateMappingDiff()
}
#endif // erGENERATEMAPPINGDIFF
-// static
void ScCompiler::DeInit()
{
if (pCharClassEnglish)
@@ -325,7 +324,6 @@ bool ScCompiler::IsEnglishSymbol( const String& rName )
return false; // no valid function name
}
-// static
void ScCompiler::InitCharClassEnglish()
{
::com::sun::star::lang::Locale aLocale(
@@ -4184,7 +4182,6 @@ void ScCompiler::MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow )
}
}
-// static
// Wrap-adjust relative references of a RangeName to current position,
// don't call for other token arrays!
void ScCompiler::MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos,
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 51e400a..5a5a0ff 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -461,7 +461,7 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart,
return bFound;
}
-BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static
+BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject )
{
if ( pObject->GetLayer()==SC_LAYER_INTERN &&
pObject->IsPolyObj() && pObject->GetPointCount()==2 )
@@ -1706,7 +1706,6 @@ void ScDetectiveFunc::InsertObject( ScDetectiveObjType eType,
}
}
-// static
ColorData ScDetectiveFunc::GetArrowColor()
{
if (!bColorsInitialized)
@@ -1714,7 +1713,6 @@ ColorData ScDetectiveFunc::GetArrowColor()
return nArrowColor;
}
-// static
ColorData ScDetectiveFunc::GetErrorColor()
{
if (!bColorsInitialized)
@@ -1722,7 +1720,6 @@ ColorData ScDetectiveFunc::GetErrorColor()
return nErrorColor;
}
-// static
ColorData ScDetectiveFunc::GetCommentColor()
{
if (!bColorsInitialized)
@@ -1730,7 +1727,6 @@ ColorData ScDetectiveFunc::GetCommentColor()
return nCommentColor;
}
-// static
void ScDetectiveFunc::InitializeColors()
{
// may be called several times to update colors from configuration
@@ -1743,7 +1739,6 @@ void ScDetectiveFunc::InitializeColors()
bColorsInitialized = TRUE;
}
-// static
BOOL ScDetectiveFunc::IsColorsInitialized()
{
return bColorsInitialized;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c97e11e..52a1a76 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3614,7 +3614,7 @@ ScInterpreter::~ScInterpreter()
}
-void ScInterpreter::GlobalExit() // static
+void ScInterpreter::GlobalExit()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GlobalExit" );
DBG_ASSERT(!bGlobalStackInUse, "wer benutzt noch den TokenStack?");
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index 74c86e7..342d7a8 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -138,13 +138,11 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] =
{ "FVSCHEDULE", "FVSCHEDULE", false, "com.sun.star.sheet.addin.Analysis.getFvschedule",
"COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETFVSCHEDULE" },
};
-// static
const ScCompiler::AddInMap* ScCompiler::GetAddInMap()
{
return maAddInMap;
}
-// static
size_t ScCompiler::GetAddInMapCount()
{
return SAL_N_ELEMENTS(maAddInMap);
diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx
index 0245541..ea617a4 100644
--- a/sc/source/core/tool/optutil.cxx
+++ b/sc/source/core/tool/optutil.cxx
@@ -39,7 +39,6 @@
//------------------------------------------------------------------
-// static
BOOL ScOptionsUtil::IsMetricSystem()
{
//! which language should be used here - system language or installed office language?
diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx
index 9cb9572..916f713 100644
--- a/sc/source/core/tool/progress.cxx
+++ b/sc/source/core/tool/progress.cxx
@@ -141,7 +141,6 @@ ScProgress::~ScProgress()
}
}
-// static
void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait )
{
@@ -167,7 +166,6 @@ void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait )
}
-// static
void ScProgress::DeleteInterpretProgress()
{
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 9fa4837..8b50bad 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -426,7 +426,7 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable)
}
-void ScRangeData::MakeValidName( String& rName ) // static
+void ScRangeData::MakeValidName( String& rName )
{
// strip leading invalid characters
diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx
index 0fc3815..0f62f85 100644
--- a/sc/source/core/tool/rangeseq.cxx
+++ b/sc/source/core/tool/rangeseq.cxx
@@ -378,7 +378,6 @@ bool ScApiTypeConversion::ConvertAnyToDouble( double & o_fVal,
//------------------------------------------------------------------------
-// static
ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::Any & rAny )
{
ScMatrixRef xMatrix;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 7ae079c..b935525 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -527,7 +527,6 @@ BOOL ScToken::Is3DRef() const
return FALSE;
}
-// static
FormulaTokenRef ScToken::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2,
const ScAddress & rPos, bool bReuseDoubleRef )
{
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 22f6205..49957eb 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -75,7 +75,6 @@ ScDataObject* ScUnitConverterData::Clone() const
}
-// static
void ScUnitConverterData::BuildIndexString( String& rStr,
const String& rFromUnit, const String& rToUnit )
{
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 14dcf7d..902616c 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -842,7 +842,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
} // namespace
-/*static*/ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const
SfxItemSet& rItemSet )
+sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet&
rItemSet )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
@@ -884,7 +884,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
return nScript;
}
-/*static*/ Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet&
rItemSet, sal_Int16 nScript )
+Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet,
sal_Int16 nScript )
{
namespace ApiScriptType = ::com::sun::star::i18n::ScriptType;
@@ -908,7 +908,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet,
return aFont;
}
-/*static*/ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet,
sal_Int16 nScript, bool bDeep )
+bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16
nScript, bool bDeep )
{
static const USHORT pnCommonIds[] = {
ATTR_FONT_UNDERLINE, ATTR_FONT_CROSSEDOUT, ATTR_FONT_CONTOUR,
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index a7fa5fb..a324b25 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -214,7 +214,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
{
}
-/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStream&
rStrm )
+XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStream& rStrm )
{
XclImpDrawObjRef xDrawObj;
@@ -246,7 +246,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
return xDrawObj;
}
-/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStream&
rStrm )
+XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStream& rStrm )
{
XclImpDrawObjRef xDrawObj;
@@ -279,7 +279,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
return xDrawObj;
}
-/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStream&
rStrm )
+XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStream& rStrm )
{
XclImpDrawObjRef xDrawObj;
@@ -322,7 +322,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
return xDrawObj;
}
-/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStream&
rStrm )
+XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm )
{
XclImpDrawObjRef xDrawObj;
@@ -3704,7 +3704,7 @@ XclImpDrawing::~XclImpDrawing()
{
}
-/*static*/ Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm )
+Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm )
{
Graphic aGraphic;
sal_uInt16 nFormat, nEnv;
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 28b0caf..cf76d52 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -585,7 +585,7 @@ bool lclSkipEmptyParentheses( const sal_Unicode*& rpcString, const sal_Unicode*
// ----------------------------------------------------------------------------
-/*static*/ void ScXMLConditionHelper::parseCondition(
+void ScXMLConditionHelper::parseCondition(
ScXMLConditionParseResult& rParseResult, const OUString& rAttribute, sal_Int32 nStartIndex
)
{
rParseResult.meToken = XML_COND_INVALID;
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index ca23927..989c141 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -268,7 +268,6 @@ ScDrawTransferObj::~ScDrawTransferObj()
delete pDragSourceView;
}
-// static
ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* )
{
ScDrawTransferObj* pObj = SC_MOD()->GetClipData().pDrawClipboard;
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 9a9d5fc..e829a2c 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -59,7 +59,7 @@ ScRangeFindList::~ScRangeFindList()
}
}
-ColorData ScRangeFindList::GetColorName( size_t nIndex ) // static
+ColorData ScRangeFindList::GetColorName( size_t nIndex )
{
return aColNames[nIndex % SC_RANGECOLORS];
}
diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx
index f2de0d7..47bde0c 100644
--- a/sc/source/ui/app/scmod2.cxx
+++ b/sc/source/ui/app/scmod2.cxx
@@ -50,7 +50,6 @@ using namespace com::sun::star;
//------------------------------------------------------------------
-// static
void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang,
BOOL& rAutoSpell )
{
@@ -67,7 +66,6 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCt
rAutoSpell = aOptions.bIsSpellAuto;
}
-// static
void ScModule::SetAutoSpellProperty( BOOL bSet )
{
// use SvtLinguConfig instead of service LinguProperties to avoid
@@ -81,7 +79,6 @@ void ScModule::SetAutoSpellProperty( BOOL bSet )
-// static
BOOL ScModule::HasThesaurusLanguage( USHORT nLang )
{
if ( nLang == LANGUAGE_NONE )
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 879b561..48e10f4 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -84,7 +84,6 @@ BOOL lcl_IsURLButton( SdrObject* pObject )
return bRet;
}
-// static
ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView )
{
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 05abff4..20323b2 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -85,7 +85,6 @@ using namespace com::sun::star;
// -----------------------------------------------------------------------
-// static
void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL&
nCol )
{
SCCOL nMaxCol = 0;
@@ -107,7 +106,6 @@ void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCR
nCol = nMaxCol;
}
-// static
void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor,
const ScRange& rBlock, BOOL bMetaFile )
{
@@ -216,7 +214,6 @@ ScTransferObj::~ScTransferObj()
}
-// static
ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin )
{
ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard;
@@ -732,7 +729,6 @@ void ScTransferObj::InitDocShell()
}
}
-// static
SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle )
{
// update ScGlobal::pDrawClipDocShellRef
@@ -752,7 +748,6 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle )
}
}
-// static
void ScTransferObj::StripRefs( ScDocument* pDoc,
SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
ScDocument* pDestDoc, SCCOL nSubX, SCROW nSubY )
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 4a5a293..ecce501 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -80,7 +80,6 @@ using namespace com::sun::star;
#define SC_DBPROP_SELECTION "Selection"
#define SC_DBPROP_CURSOR "Cursor"
-// static
void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame )
{
// called after opening the database beamer
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 105469b..1163400 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2408,7 +2408,7 @@ void ScDocShell::PrepareReload()
}
-String ScDocShell::GetOwnFilterName() // static
+String ScDocShell::GetOwnFilterName()
{
return String::CreateFromAscii(pFilterSc50);
}
@@ -2418,32 +2418,32 @@ String ScDocShell::GetHtmlFilterName()
return String::CreateFromAscii(pFilterHtml);
}
-String ScDocShell::GetWebQueryFilterName() // static
+String ScDocShell::GetWebQueryFilterName()
{
return String::CreateFromAscii(pFilterHtmlWebQ);
}
-String ScDocShell::GetAsciiFilterName() // static
+String ScDocShell::GetAsciiFilterName()
{
return String::CreateFromAscii(pFilterAscii);
}
-String ScDocShell::GetLotusFilterName() // static
+String ScDocShell::GetLotusFilterName()
{
return String::CreateFromAscii(pFilterLotus);
}
-String ScDocShell::GetDBaseFilterName() // static
+String ScDocShell::GetDBaseFilterName()
{
return String::CreateFromAscii(pFilterDBase);
}
-String ScDocShell::GetDifFilterName() // static
+String ScDocShell::GetDifFilterName()
{
return String::CreateFromAscii(pFilterDif);
}
-BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static
+BOOL ScDocShell::HasAutomaticTableName( const String& rFilter )
{
// TRUE for those filters that keep the default table name
// (which is language specific)
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 382e889..217fe8f 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -454,7 +454,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink )
// === ScDocumentLoader ==================================================
-String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static
+String ScDocumentLoader::GetOptions( SfxMedium& rMedium )
{
SfxItemSet* pSet = rMedium.GetItemSet();
const SfxPoolItem* pItem;
@@ -466,7 +466,7 @@ String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static
BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
String& rFilter, String& rOptions,
- BOOL bWithContent, BOOL bWithInteraction ) // static
+ BOOL bWithContent, BOOL bWithInteraction )
{
TypeId aScType = TYPE(ScDocShell);
SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( &aScType );
@@ -520,7 +520,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName,
return bOK;
}
-void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static
+void ScDocumentLoader::RemoveAppPrefix( String& rFilterName )
{
String aAppPrefix = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP ));
aAppPrefix.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 5577f53..c1f19fa 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -157,7 +157,6 @@ public:
};
-// static
inline BOOL ScImportExport::IsEndianSwap( const SvStream& rStrm )
{
#ifdef OSL_BIGENDIAN
@@ -167,7 +166,6 @@ inline BOOL ScImportExport::IsEndianSwap( const SvStream& rStrm )
#endif
}
-// static
inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm )
{
#ifdef OSL_BIGENDIAN
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index 05f1662..68ca734 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -83,7 +83,6 @@ uno::Reference<sheet::XSolver> lcl_CreateSolver( const uno::Reference<uno::XInte
return xSolver;
}
-// static
void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames,
uno::Sequence<rtl::OUString>& rDescriptions )
{
@@ -142,7 +141,6 @@ void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames,
}
}
-// static
uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rImplName )
{
uno::Reference<sheet::XSolver> xSolver;
@@ -188,7 +186,6 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rIm
return xSolver;
}
-// static
uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( const rtl::OUString& rImplName )
{
uno::Sequence<beans::PropertyValue> aDefaults;
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 8f6581a..bdc3478 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -738,7 +738,7 @@ void ScContentTree::GetDbNames()
}
}
-bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ) // static
+bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier )
{
bool bRet = false;
switch ( nContentType )
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 8d7dd7d..9be3f8a 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -213,7 +213,6 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit )
return 0;
}
-// static
SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet)
{
return new ScTpFormulaOptions(pParent, rCoreSet);
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 54d0994..c442e49 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -201,7 +201,6 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const
}
}
-// static
ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocument* pDoc )
{
ScAreaLinkSaveCollection* pColl = NULL;
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 9b9e83d..be244a5 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -145,14 +145,14 @@ void ScSimpleUndo::EndRedo()
pDocShell->SetInUndo( FALSE );
}
-void ScSimpleUndo::ShowTable( SCTAB nTab ) // static
+void ScSimpleUndo::ShowTable( SCTAB nTab )
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell->SetTabNo( nTab );
}
-void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static
+void ScSimpleUndo::ShowTable( const ScRange& rRange )
{
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index d9c1cfd..1aa777e 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -141,7 +141,6 @@ void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRem
pHdl->ForgetLastPattern();
}
-// static
void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName,
SfxStyleFamily eStyleFamily, const ScStyleSaveData& rData )
{
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index a9a186b..1b57594 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -470,7 +470,6 @@ sal_Int64 SAL_CALL ScAutoFormatObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScAutoFormatObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -487,7 +486,6 @@ const uno::Sequence<sal_Int8>& ScAutoFormatObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScAutoFormatObj* ScAutoFormatObj::getImplementation(
const uno::Reference<uno::XInterface> xObj )
{
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a7d6708..986b5d4 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4090,7 +4090,6 @@ sal_Int64 SAL_CALL ScCellRangesBase::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScCellRangesBase::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -4107,7 +4106,6 @@ const uno::Sequence<sal_Int8>& ScCellRangesBase::getUnoTunnelId()
return *pSeq;
}
-// static
ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScCellRangesBase* pRet = NULL;
@@ -4741,7 +4739,6 @@ uno::Sequence<rtl::OUString> SAL_CALL
ScCellRangesObj::getSupportedServiceNames(
//------------------------------------------------------------------------
-// static
uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument* pDoc, const
ScRange& rR )
{
SfxObjectShell* pObjSh = pDoc->GetDocumentShell();
@@ -6054,7 +6051,7 @@ uno::Sequence<rtl::OUString> SAL_CALL
ScCellRangeObj::getSupportedServiceNames()
//------------------------------------------------------------------------
-const SvxItemPropertySet* ScCellObj::GetEditPropertySet() // static
+const SvxItemPropertySet* ScCellObj::GetEditPropertySet()
{
return lcl_GetEditPropertySet();
}
@@ -8707,7 +8704,6 @@ sal_Int64 SAL_CALL ScTableSheetObj::getSomething(
return ScCellRangeObj::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScTableSheetObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -8724,7 +8720,6 @@ const uno::Sequence<sal_Int8>& ScTableSheetObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScTableSheetObj* pRet = NULL;
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index d648386..da7632b 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -151,7 +151,6 @@ SC_SIMPLE_SERVICE_INFO( ScSubTotalFieldObj, "ScSubTotalFieldObj", "com.sun.star.
//------------------------------------------------------------------------
-// static
ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eSummary )
{
ScSubTotalFunc eSubTotal;
@@ -177,7 +176,6 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS
return eSubTotal;
}
-// static
sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal )
{
sheet::GeneralFunction eGeneral;
@@ -856,7 +854,6 @@ sal_Int64 SAL_CALL ScSubTotalDescriptorBase::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScSubTotalDescriptorBase::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -873,7 +870,6 @@ const uno::Sequence<sal_Int8>& ScSubTotalDescriptorBase::getUnoTunnelId()
return *pSeq;
}
-// static
ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation(
const uno::Reference<sheet::XSubTotalDescriptor> xObj )
{
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 54fc721..31fc978 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -341,7 +341,6 @@ void ScPrintUIOptions::SetDefaults()
}
}
-// static
void ScModelObj::CreateAndSet(ScDocShell* pDocSh)
{
if (pDocSh)
@@ -2060,7 +2059,6 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -2077,7 +2075,6 @@ const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScModelObj* ScModelObj::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScModelObj* pRet = NULL;
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 6e71f83..a65a953 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -808,7 +808,6 @@ sal_Int64 SAL_CALL ScCellFieldObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScCellFieldObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -825,7 +824,6 @@ const uno::Sequence<sal_Int8>& ScCellFieldObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScCellFieldObj* ScCellFieldObj::getImplementation(
const uno::Reference<text::XTextContent> xObj )
{
@@ -1469,7 +1467,6 @@ sal_Int64 SAL_CALL ScHeaderFieldObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScHeaderFieldObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -1486,7 +1483,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFieldObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScHeaderFieldObj* ScHeaderFieldObj::getImplementation(
const uno::Reference<text::XTextContent> xObj )
{
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 56ba41e..c484dc5 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -491,7 +491,6 @@ sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScTableConditionalFormat::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -508,7 +507,6 @@ const uno::Sequence<sal_Int8>& ScTableConditionalFormat::getUnoTunnelId()
return *pSeq;
}
-// static
ScTableConditionalFormat* ScTableConditionalFormat::getImplementation(
const uno::Reference<sheet::XSheetConditionalEntries> xObj )
{
@@ -1027,7 +1025,6 @@ sal_Int64 SAL_CALL ScTableValidationObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScTableValidationObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -1044,7 +1041,6 @@ const uno::Sequence<sal_Int8>& ScTableValidationObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScTableValidationObj* ScTableValidationObj::getImplementation(
const uno::Reference<beans::XPropertySet> xObj )
{
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index e6cc6d8..9c5ac45 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -89,7 +89,6 @@ public:
//------------------------------------------------------------------------
-// static
ScDocument* ScTempDocSource::CreateDocument()
{
ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index fdd3d7d..229f66b 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -47,7 +47,6 @@ SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unk
//------------------------------------------------------------------------
-// static
uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny )
{
if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE )
@@ -57,7 +56,6 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A
return uno::Reference<uno::XInterface>(); //! Exception?
}
-// static
sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, sal_Bool bDefault )
{
@@ -83,7 +81,6 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope
return bRet;
}
-// static
sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
@@ -103,7 +100,6 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp
return nRet;
}
-// static
sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp,
const rtl::OUString& rName, long nDefault )
{
@@ -133,7 +129,6 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp
return nRet;
}
-// static
OUString ScUnoHelpFunctions::GetStringProperty(
const Reference<beans::XPropertySet>& xProp, const OUString& rName, const OUString& rDefault )
{
@@ -153,7 +148,6 @@ OUString ScUnoHelpFunctions::GetStringProperty(
return aRet;
}
-// static
sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
{
if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN )
@@ -161,7 +155,6 @@ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny )
return FALSE;
}
-// static
sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
{
sal_Int16 nRet = 0;
@@ -170,7 +163,6 @@ sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny )
return 0;
}
-// static
sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny )
{
sal_Int32 nRet = 0;
@@ -179,7 +171,6 @@ sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny )
return 0;
}
-// static
sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
{
sal_Int32 nRet = 0;
@@ -190,13 +181,11 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
return nRet;
}
-// static
void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
{
rAny.setValue( &bValue, getBooleanCppuType() );
}
-// static
void ScUnoHelpFunctions::SetOptionalPropertyValue(
Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
{
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index d4081db..99d189a 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -461,7 +461,6 @@ sal_Int64 SAL_CALL ScNamedRangeObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -478,7 +477,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScNamedRangeObj* ScNamedRangeObj::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScNamedRangeObj* pRet = NULL;
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index a7b929f..06f01aa 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -43,7 +43,6 @@
using namespace com::sun::star;
//------------------------------------------------------------------------
-// static
const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
{
static SfxItemPropertyMapEntry aMap[] =
@@ -65,7 +64,6 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
return aMap;
}
-// static
sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
const SfxItemPropertyMap& rPropMap,
const rtl::OUString& aPropertyName, const uno::Any& aValue )
@@ -138,7 +136,6 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions,
return sal_True;
}
-// static
uno::Any ScDocOptionsHelper::getPropertyValue(
const ScDocOptions& rOptions,
const SfxItemPropertyMap& rPropMap,
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index ef0598b..9e7e6d4 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -81,7 +81,6 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap()
return aShapeMap_Impl;
}
-// static
const SvEventDescription* ScShapeObj::GetSupportedMacroItems()
{
static const SvEventDescription aMacroDescriptionsImpl[] =
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index 61cf4fd..2379715 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -242,7 +242,6 @@ sal_Int64 SAL_CALL ScCellSearchObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScCellSearchObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -259,7 +258,6 @@ const uno::Sequence<sal_Int8>& ScCellSearchObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScCellSearchObj* ScCellSearchObj::getImplementation(
const uno::Reference<util::XSearchDescriptor> xObj )
{
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 6750c69..6d22117 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -492,7 +492,6 @@ BOOL lcl_EndsWithUser( const String& rString )
pChar[nLen-1] == ')';
}
-// static
String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, UINT16 nType )
{
BOOL bDisplayIsProgrammatic = FALSE;
@@ -523,7 +522,6 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName
return rDispName;
}
-// static
String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, UINT16 nType )
{
if ( lcl_EndsWithUser( rProgName ) )
@@ -1132,7 +1130,6 @@ sal_Int64 SAL_CALL ScStyleObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScStyleObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -1149,7 +1146,6 @@ const uno::Sequence<sal_Int8>& ScStyleObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScStyleObj* ScStyleObj::getImplementation(
const uno::Reference<uno::XInterface> xObj )
{
@@ -1304,7 +1300,6 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName )
}
}
-// static
uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules()
{
SvxNumRule aRule( 0, 0, TRUE ); // nothing supported
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index d2c9727..7eade4c 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -383,7 +383,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs
//! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection
verfuegbar
}
-void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static
+void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData )
{
String aDummy(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "???" )));
rData.aTitle = aDummy;
diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx
index 9112d18..76cbe6f 100644
--- a/sc/source/ui/unoobj/tokenuno.cxx
+++ b/sc/source/ui/unoobj/tokenuno.cxx
@@ -336,14 +336,12 @@ void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData&
rR
rAPI.Flags = nFlags;
}
-// static
bool ScTokenConversion::ConvertToTokenArray( ScDocument& rDoc,
ScTokenArray& rTokenArray, const uno::Sequence<sheet::FormulaToken>& rSequence )
{
return !rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager());
}
-// static
bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc,
uno::Sequence<sheet::FormulaToken>& rSequence, const ScTokenArray& rTokenArray )
{
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 5b8384c..1a15a37 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -2289,7 +2289,6 @@ sal_Int64 SAL_CALL ScTabViewObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScTabViewObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -2306,7 +2305,6 @@ const uno::Sequence<sal_Int8>& ScTabViewObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScTabViewObj* ScTabViewObj::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScTabViewObj* pRet = NULL;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index dd746eb..8eaa0a0 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -407,7 +407,7 @@ ScVbaRange::getScDocShell() throw (uno::RuntimeException)
return excel::GetDocShellFromRange( mxRange );
}
-/*static*/ ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange >&
rxRange )
+ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange >& rxRange )
{
// FIXME: always save to use dynamic_cast? Or better to (implement and) use XTunnel?
return dynamic_cast< ScVbaRange* >( rxRange.get() );
@@ -420,7 +420,7 @@ uno::Reference< frame::XModel > ScVbaRange::getUnoModel() throw (uno::RuntimeExc
throw uno::RuntimeException();
}
-/*static*/ uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference<
excel::XRange >& rxRange ) throw (uno::RuntimeException)
+uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >&
rxRange ) throw (uno::RuntimeException)
{
if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) )
return pScVbaRange->getUnoModel();
@@ -434,7 +434,7 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException)
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain UNO
range implementation object" ) ), uno::Reference< uno::XInterface >() );
}
-/*static*/ const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >&
rxRange ) throw (uno::RuntimeException)
+const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange )
throw (uno::RuntimeException)
{
if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) )
return pScVbaRange->getScRangeList();
@@ -2822,7 +2822,7 @@ uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException)
return aAny;
}
-/*static*/ uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange )
throw (uno::RuntimeException)
+uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw
(uno::RuntimeException)
{
if( ScVbaRange* pVbaRange = getImplementation( rxRange ) )
return pVbaRange->getCellRange();
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index c8ecbbc..0f8af8b 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -53,7 +53,6 @@ using namespace com::sun::star;
//==================================================================
-// static
USHORT ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts )
{
ScDrawLayer* pModel = pDoc->GetDrawLayer();
--
1.7.3.5
From 59ab05bb16d6513607e0f92fe98d1dea306ce310 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 17:38:29 +0100
Subject: [PATCH 2/7] Remove some more dead code
---
.../accessibility/AccStatisticsObject.hxx | 11 ------
.../controller/main/ChartController_Window.cxx | 33 +------------------
chart2/source/view/inc/VDiagram.hxx | 3 --
sc/source/ui/drawfunc/drawsh.cxx | 3 --
sc/source/ui/pagedlg/areasdlg.cxx | 1 -
sc/source/ui/unoobj/scdetect.cxx | 2 -
sc/workben/addin.cxx | 9 -----
7 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index d20ee80..31e2325 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -38,15 +38,6 @@ namespace chart
class AccStatisticsObject : public AccessibleChartElement
{
public:
- /*
- enum StatisticsObjectType
- {
- MEAN_VAL_LINE = OBJECTTYPE_AVERAGEVALUE,
- ERROR_BARS = OBJECTTYPE_ERROR,
- REGRESSION = OBJECTTYPE_REGRESSION
- };
- */
-
AccStatisticsObject( const AccessibleElementInfo& rAccInfo );
virtual ~AccStatisticsObject();
@@ -58,8 +49,6 @@ public:
virtual ::rtl::OUString SAL_CALL getImplementationName() throw
(::com::sun::star::uno::RuntimeException);
private:
- //const StatisticsObjectType m_eType;
- //const sal_uInt16 m_nSeriesIndex;
};
} // accessibility
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index b0882f8..6a5b30e 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -767,8 +767,6 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
}
- //?? pDrawViewWrapper->GetPageView()->DragPoly();
-
impl_SetMousePointer( rMEvt );
}
void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
@@ -1087,7 +1085,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
}
- //const sal_Int32 nIdBeforeFormat = nUniqueId;
if( bIsPoint )
{
if( bHasDataLabelAtPoint )
@@ -1139,10 +1136,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:FormatYErrorBars") );
- //if( nIdBeforeFormat != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeInsert = nUniqueId;
+ xPopupMenu->insertSeparator( -1 );
if( !bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:InsertDataLabels") );
@@ -1155,10 +1149,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( !bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:InsertYErrorBars") );
- //if( nIdBeforeInsert != nUniqueId )
- // xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeDelete = nUniqueId;
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints &&
bHasFormattedDataPointsOtherThanSelected ) )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:DeleteDataLabels") );
@@ -1174,8 +1164,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasFormattedDataPointsOtherThanSelected )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:ResetAllDataPoints"));
- //if( nIdBeforeDelete != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
+ xPopupMenu->insertSeparator( -1 );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
@@ -1328,7 +1317,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
KeyCode aKeyCode( rKEvt.GetKeyCode());
sal_uInt16 nCode = aKeyCode.GetCode();
-// bool bShift = aKeyCode.IsShift();
bool bAlternate = aKeyCode.IsMod2();
if( m_apAccelExecute.get() )
@@ -1348,8 +1336,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- //if( m_pDrawViewWrapper->IsAction() );
-
// keyboard accessibility
ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
if( ! bReturn )
@@ -1562,21 +1548,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- /* old chart:
- // Ctrl-Shift-R: Repaint
- if (!bReturn && GetWindow())
- {
- KeyCode aKeyCode = rKEvt.GetKeyCode();
-
- if (aKeyCode.IsMod1() && aKeyCode.IsShift()
- && aKeyCode.GetCode() == KEY_R)
- {
- // 3D-Kontext wieder zerstoeren
- GetWindow()->Invalidate();
- bReturn = TRUE;
- }
- }
- */
return bReturn;
}
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 1018a5d..37d9eda 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -78,9 +78,6 @@ public: //methods
::basegfx::B2IRectangle adjustInnerSize( const ::basegfx::B2IRectangle& rConsumedOuterRect
);
- // updateShapes(..);
- // const awt::Point& rPos, const awt::Size& rSize );
-
private: //methods
void createShapes_2d();
void createShapes_3d();
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 8b7e21d..02f959d 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -113,7 +113,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
{
USHORT nSlot = rReq.GetSlot();
Window* pWin = pViewData->GetActiveWin();
-// SfxViewFrame* pViewFrame = SfxViewShell::Current()->GetViewFrame(); //!!!
koennte knallen
ScDrawView* pView = pViewData->GetScDrawView();
SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer();
@@ -242,7 +241,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
if( !pArgs )
{
- // const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
if( rMarkList.GetMark(0) != 0 )
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -254,7 +252,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
// --------- Itemset fuer Groesse und Position --------
SfxItemSet aNewGeoAttr(pView->GetGeoAttrFromMarked());
- //SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog(pWin, pView);
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
if ( pFact )
{
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 6fbac53..4bccc56 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -387,7 +387,6 @@ BOOL ScPrintAreasDlg::Impl_CheckRefStrings()
const USHORT nValidRange = nValidAddr | SCA_VALID_ROW2 | SCA_VALID_COL2;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
- // const sal_Unicode rsep = ScCompiler::GetNativeSymbol(ocRange).GetChar(0);
ScAddress aAddr;
ScRange aRange;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 673dae3..7ab5b54 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -637,8 +637,6 @@ static BOOL lcl_MayBeDBase( SvStream& rStream )
pFilterQPro6
};
- // const UINT16 nByteMask = 0xFF;
-
// suchen Sie jetzt!
// ... realisiert ueber 'Mustererkennung'
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index f93ac30..1e0a537 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -341,8 +341,6 @@ UString ScTestAddIn::getDisplayCategoryName(const UString& aProgrammaticFunction
void ScTestAddIn::setLocale(const lang::Locale& eLocale) THROWS( (UsrSystemException) )
{
aFuncLoc = eLocale;
-// DBG_ERROR( UStringToString(aFuncLoc.Language, CHARSET_SYSTEM) + String("-") +
-// UStringToString(aFuncLoc.Country, CHARSET_SYSTEM) );
}
::com::sun::star::lang::Locale SAL_CALL ScTestAddIn::getLocale( )
throw(::com::sun::star::uno::RuntimeException)
@@ -375,14 +373,10 @@ double SAL_CALL ScTestAddIn::addOne( double fValue )
throw(::com::sun::star::uno
::rtl::OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xCaller, double fValue )
throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" );
-//! if ( aDateAny.getReflection()->equals( *Date_getReflection() ) )
{
util::Date aDate;
aDateAny >>= aDate;
- //const Date* pDate = (const Date*)aDateAny.get();
- //if (pDate)
{
- //Date aNewDate = *pDate;
Date aNewDate( aDate.Day, aDate.Month, aDate.Year );
aNewDate += (long)(fValue+0.5);
@@ -412,7 +406,6 @@ sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const ::com::sun::star::uno::Refe
if (!bIsTrans)
{
uno::Any aCol = xProp->getPropertyValue( L"CellBackColor" );
- //nRet = NAMESPACE_USR(OPropertyTypeConversion)::toINT32( aCol );
aCol >>= nRet;
}
return nRet;
@@ -531,8 +524,6 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence<INT32> >& aMatrix,
aInner.getArray()[2] = L"Suelz";
uno::Sequence< uno::Sequence<rtl::OUString> > aOuter( &aInner, 1 );
- //return uno::Any( &aOuter, Sequence< Sequence<UString> >::getReflection() );
-
aRet <<= aOuter;
return aRet;
}
--
1.7.3.5
From 904b9fab1c2c5901c0bac940672a3810020e9ddc Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 17:58:18 +0100
Subject: [PATCH 3/7] Some more dead code removal
---
.../controller/main/ChartController_TextEdit.cxx | 15 ----
.../controller/main/ChartController_Tools.cxx | 45 ----------
.../controller/main/CommandDispatchContainer.cxx | 6 --
.../controller/main/CommandDispatchContainer.hxx | 3 -
chart2/source/controller/main/SelectionHelper.cxx | 1 -
chart2/source/model/template/ChartType.hxx | 12 ---
.../source/model/template/PieChartTypeTemplate.cxx | 12 ---
.../source/model/template/PieChartTypeTemplate.hxx | 4 -
chart2/source/tools/CommonConverters.cxx | 1 -
chart2/source/tools/DataSourceHelper.cxx | 14 ---
chart2/source/tools/OPropertySet.cxx | 86 --------------------
.../view/charttypes/CategoryPositionHelper.cxx | 2 -
.../source/view/main/DataPointSymbolSupplier.cxx | 1 -
chart2/source/view/main/ShapeFactory.cxx | 41 +---------
sc/source/filter/xml/xmlstyli.cxx | 1 -
sc/source/ui/drawfunc/fudraw.cxx | 14 ---
sc/source/ui/formdlg/dwfunctr.cxx | 19 +----
sc/source/ui/inc/tphf.hxx | 2 -
sc/source/ui/view/viewdata.cxx | 6 --
19 files changed, 2 insertions(+), 283 deletions(-)
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 083eacf..f8af38f 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -58,7 +58,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -81,10 +80,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
m_xUndoManager->preAction( getModel());
SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
- //pOutliner->SetRefDevice(m_pChartWindow);
- //pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)pStyleSheetPool);
- //pOutliner->SetDefaultLanguage( eLang );
- //pOutliner->SetHyphenator( xHyphenator );
//#i77362 change notification for changes on additional shapes are missing
uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
@@ -102,12 +97,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
);
if(bEdit)
{
- // set undo manager at topmost shell ( SdDrawTextObjectBar )
- /*
- if( pViewSh )
- pViewSh->GetViewFrame()->GetDispatcher()->GetShell( 0 )->
- SetUndoManager(&pOutliner->GetUndoManager());
- */
m_pDrawViewWrapper->SetEditMode();
// #i12587# support for shapes in chart
@@ -236,8 +225,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
// attributes become unique (sel. has to be erased anyway)
pOutlinerView->InsertText(String());
- //SfxUndoManager& rUndoMgr = pOutliner->GetUndoManager();
- //rUndoMgr.EnterListAction( String( SchResId( STR_UNDO_INSERT_SPECCHAR )), String(
SchResId( STR_UNDO_INSERT_SPECCHAR )));
pOutlinerView->InsertText(aString, TRUE);
ESelection aSel = pOutlinerView->GetSelection();
@@ -245,8 +232,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
aSel.nStartPos = aSel.nEndPos;
pOutlinerView->SetSelection(aSel);
- //rUndoMgr.LeaveListAction();
-
// show changes
pOutliner->SetUpdateMode(TRUE);
pOutlinerView->ShowCursor();
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index 0e453e7..ccfcc4b 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -155,51 +155,6 @@ bool lcl_deleteDataCurve(
return bResult;
}
-// void lcl_CopyPageContentToPage(
-// const Reference< drawing::XDrawPage > & xSourcePage,
-// const Reference< drawing::XDrawPage > & xDestPage )
-// {
-// try
-// {
-// Reference< container::XIndexAccess > xSourceIA( xSourcePage, uno::UNO_QUERY_THROW );
-// sal_Int32 nCount( xSourceIA->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XShape > xShape;
-// if( xSourceIA->getByIndex( i ) >>= xShape )
-// xDestPage->add( xShape );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
-// // copies all shapes on all pages of xSource to the only page of xDestination
-// void lcl_CopyShapesToChart(
-// const Reference< frame::XModel > & xSource, const Reference< frame::XModel > & xDestination
)
-// {
-// try
-// {
-// Reference< drawing::XDrawPageSupplier > xDestPGSupp( xDestination, uno::UNO_QUERY_THROW
);
-// Reference< drawing::XDrawPage > xDestPage( xDestPGSupp->getDrawPage());
-// Reference< drawing::XDrawPagesSupplier > xSourcePGsSupp( xSource, uno::UNO_QUERY_THROW
);
-// Reference< drawing::XDrawPages > xSourcePages( xSourcePGsSupp->getDrawPages());
-
-// sal_Int32 nCount( xSourcePages->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XDrawPage > xSourcePage( xSourcePages->getByIndex( i ),
uno::UNO_QUERY_THROW );
-// lcl_CopyPageContentToPage( xSourcePage, xDestPage );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
} // anonymous namespace
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx
b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 447d9ae..46feedf 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -76,12 +76,6 @@ void CommandDispatchContainer::setModel(
m_xModel = xModel;
}
-// void CommandDispatchContainer::setUndoManager(
-// const Reference< chart2::XUndoManager > & xUndoManager )
-// {
-// m_xUndoManager = xUndoManager;
-// }
-
void CommandDispatchContainer::setChartDispatch(
const Reference< frame::XDispatch > xChartDispatch,
const ::std::set< OUString > & rChartCommands )
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx
b/chart2/source/controller/main/CommandDispatchContainer.hxx
index 43b743f..bcf07f4 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -87,9 +87,6 @@ public:
void setModel(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xModel );
-// void setUndoManager(
-// const ::com::sun::star::uno::Reference<
-// ::com::sun::star::chart2::XUndoManager > & xUndoManager );
/** Set a chart dispatcher that is used for all commands contained in
rChartCommands
diff --git a/chart2/source/controller/main/SelectionHelper.cxx
b/chart2/source/controller/main/SelectionHelper.cxx
index 1b7e404..bbcd931 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -51,7 +51,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
namespace
{
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 26052c6..3e400b7 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -139,23 +139,11 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
- // not implemented
-// ____ XCloneable ____
-// virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL
createClone()
-// throw (::com::sun::star::uno::RuntimeException);
-
protected:
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
m_xModifyEventForwarder;
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 8ff9eb6..e6b1205 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -114,7 +114,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -171,7 +170,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -186,7 +184,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL PieChartTypeTemplate::getInfoHelper()
@@ -202,7 +199,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -211,7 +207,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
@@ -238,11 +233,6 @@ sal_Int32 PieChartTypeTemplate::getAxisCountByDimension( sal_Int32
/*nDimension*
return 0;
}
-// void PieChartTypeTemplate::createAxes(
-// const Sequence< Reference< chart2::XCoordinateSystem > > & rCoordSys )
-// {
-// }
-
void PieChartTypeTemplate::adaptAxes(
const uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > & /*rCoordSys*/ )
{
@@ -274,8 +264,6 @@ void PieChartTypeTemplate::adaptScales(
xAxis->setScaleData( aScaleData );
}
- //------
-
xAxis = AxisHelper::getAxis( 0 /*nDimensionIndex*/,0 /*nAxisIndex*/
, aCooSysSeq[nCooSysIdx] );
if( xAxis.is() )
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx
b/chart2/source/model/template/PieChartTypeTemplate.hxx
index bbc694a..cf8f33b 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -101,10 +101,6 @@ protected:
::com::sun::star::chart2::XDiagram > & xDiagram );
virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension );
-// virtual void createAxes(
-// const ::com::sun::star::uno::Sequence<
-// ::com::sun::star::uno::Reference<
-// ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys );
virtual void adaptAxes(
const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 011564a..209daf5 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -281,7 +281,6 @@ drawing::PolyPolygonShape3D BezierToPoly(
const drawing::PolyPolygonBezierCoords& rBezier )
{
const drawing::PointSequenceSequence& rPointSequence = rBezier.Coordinates;
-// const drawing::FlagSequenceSequence& rFlags = rBezier.Flags;
drawing::PolyPolygonShape3D aRet;
aRet.SequenceX.realloc( rPointSequence.getLength() );
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index c607448..2ed6c68 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -371,9 +371,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
{
bool bHasDataRowSource = false;
bool bHasFirstCellAsLabel = false;
-// bool bHasHasCategories = false;
bool bHasCellRangeRepresentation = false;
-// bool bHasSequenceMapping = false;
uno::Reference< data::XDataProvider > xDataProvider( xChartDocument->getDataProvider() );
if( !xDataProvider.is() )
@@ -399,24 +397,12 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
bHasFirstCellAsLabel =
(aProperty.Value.hasValue() &&
aProperty.Value.isExtractableTo(::getBooleanCppuType()));
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" )
))
-// {
-// bHasHasCategories =
-// (aProperty.Value.hasValue() &&
aProperty.Value.isExtractableTo(::getBooleanCppuType()));
-// }
else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"CellRangeRepresentation" ) ))
{
::rtl::OUString aRange;
bHasCellRangeRepresentation =
(aProperty.Value.hasValue() && (aProperty.Value >>= aRange) &&
aRange.getLength() > 0);
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
-// {
-// bHasSequenceMapping =
-// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
-// ::getCppuType( reinterpret_cast<
-// const uno::Sequence< sal_Int32 > * >(0))));
-// }
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 709690e..8d7ba0d 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::style::XStyleSupplier;
-// using ::com::sun::star::beans::XFastPropertyState;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -73,11 +72,9 @@ OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMut
m_rMutex( par_rMutex ),
m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
{
- // /--
MutexGuard aGuard( m_rMutex );
if( rOther.m_pImplProperties.get())
m_pImplProperties.reset( new impl::ImplOPropertySet( * rOther.m_pImplProperties.get()));
- // \--
}
void OPropertySet::SetNewValuesExplicitlyEvenIfTheyEqualDefault()
@@ -98,10 +95,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
{
return ::cppu::queryInterface(
aType,
-// static_cast< uno::XInterface * >(
-// static_cast< uno::XWeak * >( this )),
-// static_cast< uno::XWeak * >( this ),
-// static_cast< lang::XServiceInfo * >( this ),
static_cast< lang::XTypeProvider * >( this ),
static_cast< beans::XPropertySet * >( this ),
static_cast< beans::XMultiPropertySet * >( this ),
@@ -109,45 +102,8 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
static_cast< beans::XPropertyState * >( this ),
static_cast< beans::XMultiPropertyStates * >( this ),
static_cast< XStyleSupplier * >( this ) );
-// static_cast< XFastPropertyState * >( this ) );
}
-// void SAL_CALL OPropertySet::acquire() throw ()
-// {
-// OWeakObject::acquire();
-// }
-
-// void SAL_CALL OPropertySet::release() throw ()
-// {
-// OWeakObject::release();
-// }
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-// OPropertySet::getImplementationName()
-// throw (uno::RuntimeException)
-// {
-// return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OPropertySet" ));
-// }
-
-// sal_Bool SAL_CALL
-// OPropertySet::supportsService( const OUString& ServiceName )
-// throw (uno::RuntimeException)
-// {
-// return ( 0 == ServiceName.reverseCompareToAsciiL(
-// RTL_CONSTASCII_STRINGPARAM( "com.sun.star.beans.PropertySet" )));
-// }
-
-// Sequence< OUString > SAL_CALL
-// OPropertySet::getSupportedServiceNames()
-// throw (uno::RuntimeException)
-// {
-// Sequence< OUString > aServiceNames( 1 );
-// aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.beans.PropertySet" ));
-// return aServiceNames;
-// }
-
#define LCL_PROP_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const Reference<t> *>(0)))
// // ____ XTypeProvider ____
@@ -157,15 +113,12 @@ Sequence< uno::Type > SAL_CALL
{
static Sequence< uno::Type > aTypeList;
- // /--
MutexGuard aGuard( m_rMutex );
if( aTypeList.getLength() == 0 )
{
::std::vector< uno::Type > aTypes;
-// aTypes.push_back( LCL_PROP_CPPUTYPE( uno::XWeak ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XServiceInfo ));
aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XTypeProvider ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertySet ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertySet ));
@@ -173,13 +126,11 @@ Sequence< uno::Type > SAL_CALL
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertyState ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertyStates ));
aTypes.push_back( LCL_PROP_CPPUTYPE( XStyleSupplier ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( XFastPropertyState ));
aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
}
return aTypeList;
- // \--
}
Sequence< sal_Int8 > SAL_CALL
@@ -370,7 +321,6 @@ void SAL_CALL OPropertySet::getFastPropertyValue
{
if( ! m_pImplProperties->GetPropertyValueByHandle( rValue, nHandle ))
{
-// OSL_TRACE( "OPropertySet: asking style for property" );
// property was not set -> try style
uno::Reference< beans::XFastPropertySet > xStylePropSet( m_pImplProperties->GetStyle(),
uno::UNO_QUERY );
if( xStylePropSet.is() )
@@ -429,7 +379,6 @@ void SAL_CALL OPropertySet::getFastPropertyValue
}
else
{
-// OSL_TRACE( "OPropertySet: no style => getting default for property" );
// there is no style (or the style does not support XFastPropertySet)
// => take the default value
try
@@ -467,41 +416,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle
)
0 );
}
-// ____ XFastPropertyState ____
-// beans::PropertyState OPropertySet::SAL_CALL getFastPropertyState( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// return m_pImplProperties->GetPropertyStateByHandle( nHandle );
-// }
-
-// uno::Sequence< beans::PropertyState > OPropertySet::SAL_CALL getFastPropertyStates(
-// const uno::Sequence< sal_Int32 >& aHandles )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// ::std::vector< sal_Int32 > aHandleVec(
-// aHandles.getConstArray(),
-// aHandles.getConstArray() + aHandles.getLength() );
-
-// return m_pImplProperties->GetPropertyStatesByHandle( aHandleVec );
-// }
-
-// void OPropertySet::SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// m_pImplProperties->SetPropertyToDefault( nHandle );
-// }
-
-// uno::Any OPropertySet::SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// lang::WrappedTargetException,
-// uno::RuntimeException)
-// {
-// return GetDefaultValue( nHandle );
-// }
-
// ____ XMultiPropertySet ____
void SAL_CALL OPropertySet::setPropertyValues(
const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values )
diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 798cfd9..ca20f13 100644
--- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -35,8 +35,6 @@
namespace chart
{
//.............................................................................
-//using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth )
: m_fSeriesCount(fSeriesCount)
diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx
b/chart2/source/view/main/DataPointSymbolSupplier.cxx
index 28a587c..a5ab357 100644
--- a/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -38,7 +38,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList(
uno::Reference< lang::XMultiServiceFactory > xShapeFactory
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 5b143b0..5465882 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -185,7 +185,6 @@ uno::Any createPolyPolygon_Cube(
//fWidthH stands for Half Width
const double fWidthH = rSize.DirectionX >=0.0? rSize.DirectionX/2.0 : -rSize.DirectionX/2.0;
const double fHeight = rSize.DirectionY;
-// const double fDepth = rSize.DirectionZ >=0.0? rSize.DirectionZ : -rSize.DirectionZ ;
const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0;
@@ -214,7 +213,6 @@ uno::Any createPolyPolygon_Cube(
for(sal_Int32 nN = nPointCount; nN--;)
*pInnerSequenceZ++ = 0.0;
- //*pInnerSequenceZ++ = -fDepth/2.0;
if(nPointCount == 5)
{
@@ -952,26 +950,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords(
fStartAngleRadian, fWidthAngleRadian, fUnitCircleInnerRadius,
aTransformationFromUnitCircle, fAngleSubdivisionRadian );
appendAndCloseBezierCoords( aReturn, aInnerArc, sal_True );
- //fill rMarkHandlePoints
- /*
- {
- rMarkHandlePoints.realloc(1);
- rMarkHandlePoints[0].realloc(6);
- sal_Int32 nHandleCount=0;
- sal_Int32 nOuterArcCount = aOuterArc.Coordinates[0].getLength();
- if(nOuterArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][0];
- if(nOuterArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][nOuterArcCount-1];
- sal_Int32 nInnerArcCount = aInnerArc.Coordinates[0].getLength();
- if(nInnerArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][0];
- if(nInnerArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][nInnerArcCount-1];
- rMarkHandlePoints[0].realloc(nHandleCount);
- }
- */
-
return aReturn;
}
@@ -1017,19 +995,6 @@ uno::Reference< drawing::XShape >
, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) );
-
- //add shape for markhandles
- /*
- drawing::PointSequenceSequence aMarkHandlePoints(1); to be filled within
getRingBezierCoords
- if( xGroup.is() )
- {
- VLineProperties aHandleLineProperties;
- aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE );
- uno::Reference< drawing::XShape > xHandleShape =
- this->createLine2D( xGroup, aMarkHandlePoints, &aHandleLineProperties );
- this->setShapeName( xHandleShape, C2U("HandlesOnly") );
- }
- */
}
catch( uno::Exception& e )
{
@@ -1493,7 +1458,7 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const
drawing::Position3D&
break;
}
}
- //return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+
return aPP;
}
@@ -1804,11 +1769,7 @@ uno::Reference< drawing::XShape >
//create shape
uno::Reference< drawing::XShape > xShape(
m_xShapeFactory->createInstance( C2U(
- //"com.sun.star.drawing.LineShape") ), uno::UNO_QUERY );
"com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyLinePathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonPathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY );
xTarget->add(xShape);
//set properties
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 4e1bd93..1fa6f76 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -75,7 +75,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace xmloff::token;
-//using namespace ::com::sun::star::text;
using namespace ::formula;
using rtl::OUString;
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 5e6340d..ce18ce1 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -92,17 +92,10 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt)
// Alt = zentrisch
BOOL bShift = rMEvt.IsShift();
-// BOOL bCtrl = rMEvt.IsMod1();
BOOL bAlt = rMEvt.IsMod2();
-// ScViewData* pViewData = pViewShell->GetViewData();
-// const ScViewOptions& rOpt = pViewData->GetOptions();
-// const ScGridOptions& rGrid = rOpt.GetGridOptions();
-// BOOL bGridOpt = rGrid.GetUseGridSnap();
-
bool bOrtho = bShift;
BOOL bAngleSnap = bShift;
-// BOOL bGridSnap = ( bGridOpt != bCtrl ); // andere Snap's nicht unterstuetzt
BOOL bCenter = bAlt;
// #i33136#
@@ -116,13 +109,6 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt)
if (pView->IsAngleSnapEnabled() != bAngleSnap)
pView->SetAngleSnapEnabled(bAngleSnap);
-/* Control fuer Snap beisst sich beim Verschieben mit "kopieren" !!!
-
- if (pView->IsGridSnap() != bGridSnap)
- pView->SetGridSnap(bGridSnap);
- if (pView->IsSnapEnabled() != bGridSnap)
- pView->SetSnapEnabled(bGridSnap);
-*/
if (pView->IsCreate1stPointAsCenter() != bCenter)
pView->SetCreate1stPointAsCenter(bCenter);
if (pView->IsResizeAtCenter() != bCenter)
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 60481d7..830de28 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -137,7 +137,6 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
aFont.SetColor(Color(COL_BLACK));
aFiFuncDesc.SetFont(aFont);
aFiFuncDesc.SetBackground( GetBackground() ); //! never transparent?
-//? SetBackground();
Link aLink=LINK( this, ScFunctionDockWin, SelHdl);
aCatBox.SetSelectHdl(aLink);
@@ -154,7 +153,6 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
StartListening( *pBindingsP, TRUE );
Point aTopLeft=aCatBox.GetPosPixel();
- //String aString=aCatBox.GetEntry( 0)+String("www");
String aString=String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
Size aTxtSize( aFiFuncDesc.GetTextWidth(aString), aFiFuncDesc.GetTextHeight() );
nMinWidth=aTxtSize.Width()+aTopLeft.X()
@@ -353,8 +351,6 @@ void ScFunctionDockWin::SetLeftRightSize()
aDiffSize.Width()-=aNewSize.Width();
aDiffSize.Height()-=aNewSize.Height();
- //@ SetUpdateMode( FALSE);
-
String aString = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ww"));
Size aTxtSize( aFuncList.GetTextWidth(aString), aFuncList.GetTextHeight() );
@@ -373,8 +369,6 @@ void ScFunctionDockWin::SetLeftRightSize()
aOldSize=aNewSize;
aNewSize.Width()+=aDiffSize.Width();
aNewSize.Height()+=aDiffSize.Height();
- //SetSizePixel(aNewSize);
- //@ SetUpdateMode( TRUE);
bSizeFlag=FALSE;
}
@@ -409,8 +403,6 @@ void ScFunctionDockWin::SetTopBottonSize()
aNewSize.Width()+=aDiffSize.Width();
aNewSize.Height()+=aDiffSize.Height();
- //SetSizePixel(aNewSize);
- //@ SetUpdateMode( TRUE);
bSizeFlag=FALSE;
}
}
@@ -719,9 +711,7 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */
case SFX_ALIGN_TOOLBOXTOP:
case SFX_ALIGN_TOOLBOXBOTTOM:
- nMinWidth= 0;/*aDDFuncList.GetPosPixel().X()+
- 10*aTxtSize.Width()+
- aFuncList.GetPosPixel().X();*/
+ nMinWidth= 0;
nMinHeight=0;
break;
@@ -737,7 +727,6 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */
nMinWidth=aTxtSize.Width()+aTopLeft.X()
+2*aFuncList.GetPosPixel().X();
nMinHeight=19*aTxtSize.Height();
- //aCatBox.SelectEntryPos(0);
break;
}
@@ -1068,12 +1057,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl )
aFuncList.SetSizePixel(aFLSize);
aFiFuncDesc.SetPosPixel(aFDTopLeft);
aFiFuncDesc.SetSizePixel(aFDSize);
- /*
- aFuncList.Invalidate();
- aFuncList.Update();
- aFiFuncDesc.Invalidate();
- aFiFuncDesc.Update();
- */
}
//...
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 7b1c541..0e1d017 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -53,8 +53,6 @@ protected:
const SfxItemSet& rSet,
USHORT nSetId );
-// using SvxHFPage::ActivatePage;
-// using SvxHFPage::DeactivatePage;
virtual void ActivatePage();
virtual void DeactivatePage();
virtual void ActivatePage( const SfxItemSet& rSet );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c524668..97cd94f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2581,12 +2581,6 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
// get some settings from displayed Excel sheet, set at Calc document
if( nTab == GetTabNo() )
{
- // selection only for displayed sheet, do not select single cell
-// Disabled, does not work correctly. Anyway, our own XML filters do not import a selection at all.
-// const ScRangeList& rSel = rTabSett.maSelection;
-// if( (rSel.Count() >= 2) || ((rSel.Count() == 1) && (*rSel.GetObject( 0 ) !=
ScRange( rCursor ))) )
-// rMarkData.MarkFromRangeList( rTabSett.maSelection, FALSE );
-
// grid color -- #i47435# set automatic grid color explicitly
if( pOptions )
{
--
1.7.3.5
From 2a8138b1065a6401cb4f0e252c465a2035180197 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 18:34:27 +0100
Subject: [PATCH 4/7] Removed some dead lines, dates and commit notes. Thanks to liuchen, limingl,
minz@cn.ibm.com and Amelia Wang for their commits!
---
sc/inc/viewuno.hxx | 4 +--
sc/source/ui/dbgui/expftext.cxx | 4 +-
sc/source/ui/dbgui/tpsort.cxx | 1 -
sc/source/ui/formdlg/dwfunctr.cxx | 46 ++++++++++++++++----------------
sc/source/ui/formdlg/privsplt.cxx | 16 ++++++------
sc/source/ui/inc/dbnamdlg.hxx | 2 +-
sc/source/ui/miscdlgs/crnrdlg.cxx | 48 ++++++++++++++++-------------------
sc/source/ui/navipi/navipi.cxx | 21 ---------------
sc/source/ui/undo/undobase.cxx | 22 ----------------
sc/source/ui/unoobj/viewuno.cxx | 2 +-
sc/source/ui/vba/vbaapplication.cxx | 35 ++++++++----------------
sc/source/ui/vba/vbaapplication.hxx | 18 ++++++-------
sc/source/ui/vba/vbadialog.cxx | 3 --
sc/source/ui/vba/vbadialog.hxx | 1 -
sc/source/ui/vba/vbadialogs.cxx | 1 -
sc/source/ui/vba/vbadialogs.hxx | 2 +-
sc/source/ui/vba/vbafilesearch.cxx | 2 +-
sc/source/ui/vba/vbaname.cxx | 2 -
sc/source/ui/vba/vbapagebreaks.cxx | 4 +-
sc/source/ui/vba/vbapagesetup.cxx | 2 -
sc/source/ui/vba/vbapagesetup.hxx | 4 +-
sc/source/ui/vba/vbarange.cxx | 18 ++++--------
sc/source/ui/vba/vbarange.hxx | 8 +++---
sc/source/ui/vba/vbavalidation.cxx | 4 +-
sc/source/ui/vba/vbaworkbook.cxx | 13 ++++-----
sc/source/ui/vba/vbaworksheet.cxx | 13 ++++-----
sc/source/ui/vba/vbaworksheet.hxx | 2 +-
27 files changed, 109 insertions(+), 189 deletions(-)
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index b2ed11b..68b0efb 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -315,13 +315,11 @@ public:
::com::sun::star::sheet::XSpreadsheet >& xActiveSheet )
throw(::com::sun::star::uno::RuntimeException);
- //liuchen 2009-9-2 support expand (but not replace) the active sheet
+ // support expand (but not replace) the active sheet
virtual void SAL_CALL selectSheet( const ::com::sun::star::uno::Reference<
::com::sun::star::sheet::XSpreadsheet >& xActiveSheet,
sal_Bool bExpand)
throw(::com::sun::star::uno::RuntimeException);
- //liuchen 2009-9-2
-
//XEnhancedMouseClickBroadcaster
virtual void SAL_CALL addEnhancedMouseClickHandler( const ::com::sun::star::uno::Reference<
diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx
index 01a6610..a496f55 100644
--- a/sc/source/ui/dbgui/expftext.cxx
+++ b/sc/source/ui/dbgui/expftext.cxx
@@ -35,7 +35,7 @@
#include <vcl/help.hxx>
/*************************************************************************
-#* Member: ScExpandedFixedText
Datum:18.09.97
+#* Member: ScExpandedFixedText
#*------------------------------------------------------------------------
#*
#* Klasse: MD_Test
@@ -56,7 +56,7 @@ ScExpandedFixedText::ScExpandedFixedText( Window* pParent,
}
/*************************************************************************
-#* Member: RequestHelp
Datum:18.09.97
+#* Member: RequestHelp
#*------------------------------------------------------------------------
#*
#* Klasse: ScExpandedFixedText
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 517a9b5..4caa08c 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -81,7 +81,6 @@ static USHORT pSortRanges[] =
* geloest. Wird eine Seite Aktiviert/Deaktiviert, so gleicht sie diese
* Datenmember mit dem eigenen Zustand ab (->Activate()/Deactivate()).
*
- * 31.01.95:
* Die Klasse SfxTabPage bietet mittlerweile ein Verfahren an:
*
* virtual BOOL HasExchangeSupport() const; -> return TRUE;
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 830de28..c3f9897 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -60,7 +60,7 @@
SFX_IMPL_DOCKINGWINDOW( ScFunctionChildWindow, FID_FUNCTION_BOX )
/*************************************************************************
-#* Member: ScFunctionChildWindow
Datum:06.10.97
+#* Member: ScFunctionChildWindow
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionChildWindow
@@ -91,7 +91,7 @@ ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP,
}
/*************************************************************************
-#* Member: ScFunctionDockWin
Datum:06.10.97
+#* Member: ScFunctionDockWin
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -168,7 +168,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
}
/*************************************************************************
-#* Member: ScFunctionDockWin
Datum:06.10.97
+#* Member: ScFunctionDockWin
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -187,7 +187,7 @@ ScFunctionDockWin::~ScFunctionDockWin()
}
/*************************************************************************
-#* Member: UpdateFunctionList
Datum:06.10.97
+#* Member: UpdateFunctionList
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -225,7 +225,7 @@ void ScFunctionDockWin::InitLRUList()
}
/*************************************************************************
-#* Member: UpdateFunctionList
Datum:10.12.99
+#* Member: UpdateFunctionList
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -249,7 +249,7 @@ void ScFunctionDockWin::UpdateLRUList()
/*************************************************************************
-#* Member: SetSize
Datum:06.10.97
+#* Member: SetSize
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -326,7 +326,7 @@ void ScFunctionDockWin::SetSize()
}
}
/*************************************************************************
-#* Member: SetLeftRightSize
Datum:15.10.97
+#* Member: SetLeftRightSize
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -374,7 +374,7 @@ void ScFunctionDockWin::SetLeftRightSize()
}
/*************************************************************************
-#* Member: SetTopBottonSize
Datum:15.10.97
+#* Member: SetTopBottonSize
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -408,7 +408,7 @@ void ScFunctionDockWin::SetTopBottonSize()
}
/*************************************************************************
-#* Member: SetMyWidthLeRi
Datum:15.10.97
+#* Member: SetMyWidthLeRi
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -448,7 +448,7 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetHeight
Datum:06.10.97
+#* Member: SetHeight
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -496,7 +496,7 @@ void ScFunctionDockWin::SetMyHeightLeRi(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetMyWidthToBo
Datum:16.10.97
+#* Member: SetMyWidthToBo
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -537,7 +537,7 @@ void ScFunctionDockWin::SetMyWidthToBo(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetHeight
Datum:16.10.97
+#* Member: SetHeight
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -566,7 +566,7 @@ void ScFunctionDockWin::SetMyHeightToBo(Size &aNewSize)
}
/*************************************************************************
-#* Member: SetDescription
Datum:13.10.97
+#* Member: SetDescription
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -621,7 +621,7 @@ void ScFunctionDockWin::SetDescription()
}
/*************************************************************************
-#* Member: Resizing
Datum:06.10.97
+#* Member: Resizing
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -643,7 +643,7 @@ void ScFunctionDockWin::Resizing( Size& rNewSize )
}
/*************************************************************************
-#* Member: Close
Datum:07.10.97
+#* Member: Close
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -671,7 +671,7 @@ BOOL ScFunctionDockWin::Close()
/*************************************************************************
-#* Member: CheckAlignment
Datum:16.10.97
+#* Member: CheckAlignment
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -734,7 +734,7 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */
return aChildAlign;
}
/*************************************************************************
-#* Member: Close
Datum:07.10.97
+#* Member: Close
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -762,7 +762,7 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
/*************************************************************************
-#* Member: Resize
Datum:06.10.97
+#* Member: Resize
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -789,7 +789,7 @@ void ScFunctionDockWin::Resize()
}
/*************************************************************************
-#* Member: UpdateFunctionList
Datum:06.10.97
+#* Member: UpdateFunctionList
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -852,7 +852,7 @@ void ScFunctionDockWin::UpdateFunctionList()
}
/*************************************************************************
-#* Member: DoEnter
Datum:06.10.97
+#* Member: DoEnter
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -968,7 +968,7 @@ void ScFunctionDockWin::DoEnter(BOOL /* bOk */) //@@ ???
/*************************************************************************
-#* Handle: SelHdl
Datum:06.10.97
+#* Handle: SelHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -1001,7 +1001,7 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb )
}
/*************************************************************************
-#* Handle: SelHdl
Datum:06.10.97
+#* Handle: SelHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
@@ -1028,7 +1028,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl )
}
/*************************************************************************
-#* Handle: SetSplitHdl
Datum:13.10.97
+#* Handle: SetSplitHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScFunctionDockWin
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index e8b0955..696873e 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -34,7 +34,7 @@
#include "privsplt.hxx"
/*************************************************************************
-#* Member: ScPrivatSplit
Datum:13.10.97
+#* Member: ScPrivatSplit
#*------------------------------------------------------------------------
#*
#* Klasse: MD_Test
@@ -78,7 +78,7 @@ ScPrivatSplit::ScPrivatSplit( Window* pParent, const ResId& rResId,
/*************************************************************************
-#* Member: MouseButtonDown
Datum:13.10.97
+#* Member: MouseButtonDown
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -103,7 +103,7 @@ void ScPrivatSplit::MouseButtonDown( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: MouseButtonUp
Datum:13.10.97
+#* Member: MouseButtonUp
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -165,7 +165,7 @@ void ScPrivatSplit::MouseButtonUp( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: MouseMove
Datum:13.10.97
+#* Member: MouseMove
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -230,7 +230,7 @@ void ScPrivatSplit::MouseMove( const MouseEvent& rMEvt )
}
/*************************************************************************
-#* Member: SetYRange
Datum:14.10.97
+#* Member: SetYRange
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -250,7 +250,7 @@ void ScPrivatSplit::SetYRange(Range cRgeY)
/*************************************************************************
-#* Member: GetDeltaY
Datum:13.10.97
+#* Member: GetDeltaY
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -268,7 +268,7 @@ short ScPrivatSplit::GetDeltaX()
}
/*************************************************************************
-#* Member: GetDeltaY
Datum:13.10.97
+#* Member: GetDeltaY
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
@@ -286,7 +286,7 @@ short ScPrivatSplit::GetDeltaY()
}
/*************************************************************************
-#* Member: CtrModified
Datum:13.10.97
+#* Member: CtrModified
#*------------------------------------------------------------------------
#*
#* Klasse: ScPrivatSplit
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index 816a4e5..8b938ae 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -70,7 +70,7 @@ private:
CheckBox aBtnDoSize;
CheckBox aBtnKeepFmt;
CheckBox aBtnStripData;
- ScExpandedFixedText aFTSource; //@18.09.97 erweiterter FixedText
+ ScExpandedFixedText aFTSource;
FixedText aFTOperations;
OKButton aBtnOk;
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 4f3e5c7..e7f0973 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -63,7 +63,7 @@ const ULONG nEntryDataDelim = 2;
/*************************************************************************
-#* Member: ScColRowNameRangesDlg
Datum:04.09.97
+#* Member: ScColRowNameRangesDlg
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -87,7 +87,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
ScViewData* ptrViewData )
: ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ),
- //
+
aFlAssign ( this, ScResId( FL_ASSIGN ) ),
aLbRange ( this, ScResId( LB_RANGE ) ),
@@ -119,7 +119,7 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
/*************************************************************************
-#* Member: ~ScColRowNameRangesDlg
Datum:04.09.97
+#* Member: ~ScColRowNameRangesDlg
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -138,7 +138,7 @@ ScColRowNameRangesDlg::~ScColRowNameRangesDlg()
/*************************************************************************
-#* Member: Init
Datum:04.09.97
+#* Member: Init
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -208,15 +208,13 @@ void ScColRowNameRangesDlg::Init()
aEdAssign.Enable();
aEdAssign.GrabFocus();
aRbAssign.Enable();
- //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus
Range1SelectHdl( 0 );
}
/*************************************************************************
-#* Member: SetColRowData
Datum:04.09.97
+#* Member: SetColRowData
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -317,7 +315,7 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef)
/*************************************************************************
-#* Member: AdjustColRowData
Datum:04.09.97
+#* Member: AdjustColRowData
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -393,7 +391,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe
/*************************************************************************
-#* Member: SetReference
Datum:04.09.97
+#* Member: SetReference
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -430,7 +428,7 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD
/*************************************************************************
-#* Member: Close
Datum:04.09.97
+#* Member: Close
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -450,7 +448,7 @@ BOOL ScColRowNameRangesDlg::Close()
/*************************************************************************
-#* Member: SetActive
Datum:04.09.97
+#* Member: SetActive
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -484,7 +482,7 @@ void ScColRowNameRangesDlg::SetActive()
/*************************************************************************
-#* Member: UpdateNames
Datum:04.09.97
+#* Member: UpdateNames
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -508,7 +506,7 @@ void ScColRowNameRangesDlg::UpdateNames()
size_t nCount, j;
USHORT nPos; //@008 Hilfsvariable q eingefuegt
- SCCOL nCol1; //@008 04.09.97
+ SCCOL nCol1;
SCROW nRow1; //Erweiterung fuer Bereichsnamen
SCTAB nTab1;
SCCOL nCol2;
@@ -619,7 +617,7 @@ void ScColRowNameRangesDlg::UpdateNames()
/*************************************************************************
-#* Member: UpdateRangeData
Datum:04.09.97
+#* Member: UpdateRangeData
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -670,7 +668,7 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam
/*************************************************************************
-#* Member: IsRefInputMode
Datum:04.09.97
+#* Member: IsRefInputMode
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -694,7 +692,7 @@ BOOL ScColRowNameRangesDlg::IsRefInputMode() const
// ========
/*************************************************************************
-#* Handler: OkBtnHdl
Datum:04.09.97
+#* Handler: OkBtnHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -728,7 +726,7 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: CancelBtnHdl
Datum:04.09.97
+#* Handler: CancelBtnHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -750,7 +748,7 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: AddBtnHdl
Datum:04.09.97
+#* Handler: AddBtnHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -823,7 +821,7 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: RemoveBtnHdl
Datum:04.09.97
+#* Handler: RemoveBtnHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -900,7 +898,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: Range1SelectHdl
Datum:04.09.97
+#* Handler: Range1SelectHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -981,14 +979,12 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG )
aEdAssign.Enable();
aRbAssign.Enable();
- //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Enable();
return 0;
}
/*************************************************************************
-#* Handler: Range1DataModifyHdl
Datum:04.09.97
+#* Handler: Range1DataModifyHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -1037,7 +1033,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: Range2DataModifyHdl
Datum:04.09.97
+#* Handler: Range2DataModifyHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -1074,7 +1070,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: ColClickHdl
Datum:04.09.97
+#* Handler: ColClickHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
@@ -1112,7 +1108,7 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG )
/*************************************************************************
-#* Handler: RowClickHdl
Datum:04.09.97
+#* Handler: RowClickHdl
#*------------------------------------------------------------------------
#*
#* Klasse: ScColRowNameRangesDlg
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index cbb1f00..6a7d3f3 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -77,7 +77,6 @@ static const xub_StrLen SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).Len();
//------------------------------------------------------------------------
-// static
void ScNavigatorDlg::ReleaseFocus()
{
SfxViewShell* pCurSh = SfxViewShell::Current();
@@ -625,14 +624,6 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
}
pNavigator->bFirstBig = ( nCmdId == 0 ); // dann spaeter
-
-/*???
- FloatingWindow* pFloat = GetFloatingWindow();
- if ( pFloat )
- pFloat->SetMinOutputSizePixel( pNavigator->GetMinOutputSizePixel() );
-*/
-
-//!? pNavigator->Show();
}
void ScNavigatorDialogWrapper::Resizing( Size& rSize )
@@ -708,12 +699,6 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW,
Win
nListModeHeight = aInitSize.Height()
+ nInitListHeight;
- // kein Resize, eh der ganze Kontext-Kram initialisiert ist!
-// SetOutputSizePixel( aInitSize ); //???
-/*! FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
- if ( pFloat)
- pFloat->SetMinOutputSizePixel( aInitSize );
-*/
ppBoundItems = new ScNavigatorControllerItem* [CTRL_ITEMS];
rBindings.ENTERREGISTRATIONS();
@@ -798,8 +783,6 @@ void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize?
rNewSize.Height() = aMinOut.Height();
}
}
-// else
-// SfxDockingWindow::Resizing(rNewSize);
}
@@ -862,7 +845,6 @@ void ScNavigatorDlg::DoResize()
// auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen,
// damit die Breite stimmt
- //@@ 03.11.97 changes begin
Point aEntryPos = aLbEntries.GetPosPixel();
Point aListPos = aLbDocuments.GetPosPixel();
aNewSize.Width() -= 2*nBorderOffset;
@@ -886,8 +868,6 @@ void ScNavigatorDlg::DoResize()
aWndScenarios.SetSizePixel( aNewSize );
aLbDocuments.SetSizePixel( aDocSize );
- //@@ 03.11.97 end
-
BOOL bListMode = (eListMode != NAV_LMODE_NONE);
FloatingWindow* pFloat = pContextWin->GetFloatingWindow();
if ( pFloat && bListMode )
@@ -1152,7 +1132,6 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab )
else if ( GetViewData() )
nCurTab = pViewData->GetTabNo();
-// aLbTables.SetTab( nCurTab );
CheckDataArea();
}
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index be244a5..0b50e87 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -200,13 +200,6 @@ void ScBlockUndo::EndUndo()
ScSimpleUndo::EndUndo();
}
-/*
-void ScBlockUndo::BeginRedo()
-{
- ScSimpleUndo::BeginRedo();
-}
-*/
-
void ScBlockUndo::EndRedo()
{
if (eMode == SC_UNDO_AUTOHEIGHT)
@@ -317,7 +310,6 @@ void ScMoveUndo::BeginUndo()
void ScMoveUndo::EndUndo()
{
- //@17.12.97 Reihenfolge der Fkt.s geaendert
DoSdrUndoAction( pDrawUndo, pDocShell->GetDocument() ); // #125875# must also be called
when pointer is null
if (pRefUndoDoc && eMode == SC_UNDO_REFLAST)
@@ -328,20 +320,6 @@ void ScMoveUndo::EndUndo()
ScSimpleUndo::EndUndo();
}
-/*
-void ScMoveUndo::BeginRedo()
-{
- ScSimpleUndo::BeginRedo();
-}
-*/
-
-/*
-void ScMoveUndo::EndRedo()
-{
- ScSimpleUndo::EndRedo();
-}
-*/
-
// -----------------------------------------------------------------------
ScDBFuncUndo::ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo
) :
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 1a15a37..96299c8 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1202,7 +1202,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet()
return NULL;
}
-//liuchen 2009-9-2 support expand (but not replace) the active sheet
+// support expand (but not replace) the active sheet
void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>&
xActiveSheet )
throw(uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 9e34165..6ff7bb3 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -49,14 +49,12 @@
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-//2009-11-06 add by limingl
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-//end
#include<ooo/vba/XCommandBars.hpp>
-#include <ooo/vba/excel/XlEnableCancelKey.hpp> //liuchen 2009-11-26
-#include <ooo/vba/excel/XlApplicationInternational.hpp> //liuchen 2009-11-26
-#include <unotools/localedatawrapper.hxx> //liuchen 2009-11-26
+#include <ooo/vba/excel/XlEnableCancelKey.hpp>
+#include <ooo/vba/excel/XlApplicationInternational.hpp>
+#include <unotools/localedatawrapper.hxx>
#include "vbaapplication.hxx"
#include "vbaworkbooks.hxx"
@@ -75,12 +73,12 @@
#include <vbahelper/vbashape.hxx>
#include "vbatextboxshape.hxx"
#include "vbaassistant.hxx"
-#include "vbafilesearch.hxx" //liuchen 2009-8-18, add the support of VBA Application.FileSearch
+#include "vbafilesearch.hxx" // add the support of VBA Application.FileSearch
#include "sc.hrc"
#include "macromgr.hxx"
-#include "global.hxx" //liuchen 2009-11-26
-#include "scmod.hxx" //liuchen 2009-11-26
-#include "docoptio.hxx" //liuchen 2009-11-26
+#include "global.hxx"
+#include "scmod.hxx"
+#include "docoptio.hxx"
#include "appoptio.hxx"
#include <osl/file.hxx>
@@ -122,7 +120,7 @@
#include <basic/sbx.hxx>
#include <basic/sbxobj.hxx>
#include <basic/sbuno.hxx>
-//limingl 2009-07-20
+
#include "vbafiledialog.hxx"
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -280,7 +278,7 @@ ScVbaApplication::getAssistant() throw (uno::RuntimeException)
return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) );
}
-//liuchen 2009-8-18, add support of VBA Application.FileSearch
+// add support of VBA Application.FileSearch
uno::Reference< XFileSearch > SAL_CALL
ScVbaApplication::getFileSearch() throw (uno::RuntimeException)
{
@@ -291,7 +289,6 @@ ScVbaApplication::getFileSearch() throw (uno::RuntimeException)
return m_xFileSearch;
}
-//liuchen
uno::Any SAL_CALL
ScVbaApplication::getSelection() throw (uno::RuntimeException)
@@ -867,7 +864,7 @@ ScVbaApplication::setVisible(sal_Bool /*bVisible*/) throw (uno::RuntimeException
{
}
-//liuchen 2009-11-25 add the support of Excel VBA Application.Iteration
+//add the support of Excel VBA Application.Iteration
//The Excel Iteration option is global and unique, but in Symphony there is an Iteration property
in ScModule and one in every ScDocument,
//so the set method will set all the Iteration properties
sal_Bool SAL_CALL
@@ -906,9 +903,8 @@ ScVbaApplication::setIteration(sal_Bool bIteration) throw (uno::RuntimeException
xPropertySet->setPropertyValue( aPropName, aIteration );
}
}
-//liuchen 2009-11-25 end
-//liuchen 2009-11-26 add the support of Excel VBA Application.EnableCancelKey
+//add the support of Excel VBA Application.EnableCancelKey
sal_Int32 SAL_CALL
ScVbaApplication::getEnableCancelKey() throw (uno::RuntimeException)
{
@@ -919,7 +915,6 @@ void SAL_CALL
ScVbaApplication::setEnableCancelKey(sal_Int32 /*lEnableCancelKey*/) throw (uno::RuntimeException)
{
}
-//liuchen 2009-11-26 end
sal_Int32 SAL_CALL ScVbaApplication::getSheetsInNewWorkbook() throw (uno::RuntimeException)
{
@@ -1370,7 +1365,6 @@ ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw (
uno::RuntimeExcep
return aRet;
}
-//Add by minz@cn.ibm.com. 2009-07-08.
uno::Any SAL_CALL
ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any& FilterIndex, const
uno::Any& Title, const uno::Any& ButtonText, const uno::Any& MultiSelect) throw
(uno::RuntimeException)
{
@@ -1516,7 +1510,6 @@ ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any&
Fi
return aRet;
}
-//liming 2009-7-17
::com::sun::star::uno::Reference< ::ooo::vba::XFileDialog > SAL_CALL
ScVbaApplication::getFileDialog() throw (::com::sun::star::uno::RuntimeException)
{
@@ -1526,7 +1519,6 @@ ScVbaApplication::getFileDialog() throw
(::com::sun::star::uno::RuntimeException
typedef std::map< ::rtl::OUString, ::rtl::OUString > FileFilterMap;
-//2009-11-06 add by limingl
uno::Any SAL_CALL
ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFilename, const
::com::sun::star::uno::Any& FileFilter, const ::com::sun::star::uno::Any& FilterIndex, const
::com::sun::star::uno::Any& Title, const ::com::sun::star::uno::Any& ButtonText ) throw
(::com::sun::star::uno::RuntimeException)
{
@@ -1706,7 +1698,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw
(uno::RuntimeExceptio
return uno::Any( xMenuBars );
}
-//liuchen 2009-11-26 add the support of Application.International
+//add the support of Application.International
sal_Int32 SAL_CALL
ConvertCountryCode(const OUString& language)
{
@@ -1767,9 +1759,7 @@ ScVbaApplication::International( sal_Int32 Index ) throw
(uno::RuntimeException)
}
return aRet;
}
-//liuchen 2009-11-26 end
-//2009-12-11 add by limingl
void SAL_CALL ScVbaApplication::Undo( ) throw (::com::sun::star::uno::RuntimeException)
{
SfxAllItemSet reqList( SFX_APP()->GetPool() );
@@ -1781,7 +1771,6 @@ void SAL_CALL ScVbaApplication::Undo( ) throw
(::com::sun::star::uno::RuntimeEx
pViewShell->ExecuteUndo(rReq);
}
}
-//end
double SAL_CALL ScVbaApplication::InchesToPoints( double Inches ) throw (uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index 6a5f655..bc047b8 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -37,7 +37,6 @@
#include <vbahelper/vbaapplicationbase.hxx>
#include <cppuhelper/implbase1.hxx>
-//typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication >
ScVbaApplication_BASE;
class ScVbaApplication : public ScVbaApplication_BASE
@@ -48,7 +47,7 @@ private:
sal_Bool m_bEnableEvents;
rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
- css::uno::Reference< ov::XFileSearch > m_xFileSearch; //
+ css::uno::Reference< ov::XFileSearch > m_xFileSearch;
protected:
virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw
(css::uno::RuntimeException);
@@ -91,7 +90,7 @@ public:
virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw (
css::uno::RuntimeException );
virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw
(css::uno::RuntimeException);
- virtual css::uno::Reference< ov::XFileSearch > SAL_CALL getFileSearch() throw
(css::uno::RuntimeException); //liuchen 2009-8-18 add the support of Application.FileSearch
+ virtual css::uno::Reference< ov::XFileSearch > SAL_CALL getFileSearch() throw
(css::uno::RuntimeException); // add the support of Application.FileSearch
virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw
(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw
(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw
(css::uno::RuntimeException);
@@ -108,10 +107,10 @@ public:
virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException); //liuchen
2009-11-25 add the support of Iteration
- virtual void SAL_CALL setIteration( sal_Bool bIteration ) throw (css::uno::RuntimeException);
//liuchen 2009-11-25 add the support of Iteration
- virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException); //liuchen
2009-11-26 add the support of EnableCancelKey
- virtual void SAL_CALL setEnableCancelKey( sal_Int32 lEnableCancelKey ) throw
(css::uno::RuntimeException); //liuchen 2009-11-26 add the support of EnableCancelKey
+ virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException); // add the
support of Iteration
+ virtual void SAL_CALL setIteration( sal_Bool bIteration ) throw (css::uno::RuntimeException);
// add the support of Iteration
+ virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException); // add
the support of EnableCancelKey
+ virtual void SAL_CALL setEnableCancelKey( sal_Int32 lEnableCancelKey ) throw
(css::uno::RuntimeException); // add the support of EnableCancelKey
virtual sal_Int32 SAL_CALL getSheetsInNewWorkbook() throw (css::uno::RuntimeException);
virtual void SAL_CALL setSheetsInNewWorkbook( sal_Int32 SheetsInNewWorkbook ) throw
(css::script::BasicErrorException, css::uno::RuntimeException);
@@ -131,9 +130,8 @@ public:
virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw
(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw
(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& FileFilter, const
css::uno::Any& FilterIndex, const css::uno::Any& Title, const css::uno::Any& ButtonText, const
css::uno::Any& MultiSelect ) throw (css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::ooo::vba::XFileDialog > SAL_CALL getFileDialog()
throw (::com::sun::star::uno::RuntimeException); //liminl 2009-08-12 add
- virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw
(css::uno::RuntimeException); //liuchen 2009-11-26
- //2009-12-04 add by limingl
+ virtual ::com::sun::star::uno::Reference< ::ooo::vba::XFileDialog > SAL_CALL getFileDialog()
throw (::com::sun::star::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw
(css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL GetSaveAsFilename( const ::com::sun::star::uno::Any&
InitialFilename, const ::com::sun::star::uno::Any& FileFilter, const ::com::sun::star::uno::Any&
FilterIndex, const ::com::sun::star::uno::Any& Title, const ::com::sun::star::uno::Any& ButtonText
) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL Undo( ) throw (::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL InchesToPoints( double Inches ) throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 452fa9a..c1f882c 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -32,7 +32,6 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-//liuchen 2009-7-27
//solve the problem that "Application.Dialogs.Item(***).Show" and "Application.Dialogs.Count"
cannot get the correct result
struct DialogMatch
{
@@ -72,7 +71,6 @@ static const DialogMatch aDialogMatchList[] =
const sal_Int32 nDialogSize = SAL_N_ELEMENTS( aDialogMatchList ) ;
-//liuchen modified 2009-2-27
rtl::OUString
ScVbaDialog::mapIndexToName( sal_Int32 nIndex )
{
@@ -106,7 +104,6 @@ ScVbaDialog::getServiceNames()
return aServiceNames;
}
-//liuchen add 2009-7-27
sal_Int32 ScVbaDialog::GetSupportedDialogCount()
{
return nDialogSize;
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 9c73aca..6ee6fd4 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -47,7 +47,6 @@ public:
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
- //liuchen 2009-7-27
static sal_Int32 GetSupportedDialogCount();
};
diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx
index 361d1a4..c64babe 100644
--- a/sc/source/ui/vba/vbadialogs.cxx
+++ b/sc/source/ui/vba/vbadialogs.cxx
@@ -65,7 +65,6 @@ ScVbaDialogs::getServiceNames()
return aServiceNames;
}
-//liuchen 2009-7-27
::sal_Int32
ScVbaDialogs::getCount() throw (uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 785757b..7510fd2 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -45,7 +45,7 @@ public:
// XCollection
virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw
(css::uno::RuntimeException);
- virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); //liuchen 2009-7-27
+ virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
// XDialogs
virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbafilesearch.cxx b/sc/source/ui/vba/vbafilesearch.cxx
index 761058b..a6d41d0 100644
--- a/sc/source/ui/vba/vbafilesearch.cxx
+++ b/sc/source/ui/vba/vbafilesearch.cxx
@@ -196,7 +196,7 @@ sal_Int32 SAL_CALL ScVbaFileSearch::Execute( ) throw (css::uno::RuntimeExceptio
return m_aSearchedFiles.getLength();
}
-//liuchen 2009-11-5 set ScVbaApplication::getDefaultFilePath( ) as the InitPath for FileSearch
+// set ScVbaApplication::getDefaultFilePath( ) as the InitPath for FileSearch
::rtl::OUString ScVbaFileSearch::getInitPath() throw (css::uno::RuntimeException)
{
String aPath;
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index d1f0c7e..db2c434 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -70,8 +70,6 @@ ScVbaName::getWorkSheet() throw (css::uno::RuntimeException)
ScVbaName::getName() throw (css::uno::RuntimeException)
{
String sName;
- //sName += UniString( getWorkSheet()->getName()); //liuchen 2009-9-9 resolve the defect that
the name get by macro code are not the same with that in UI (for example, if a name of "AA" is
found in the UI "Define Names" dialog box, the result of get that name through macro code will be
"Sheet1!AA")
- //sName += String::CreateFromAscii("!");
sName += UniString ( mxNamedRange->getName() );
return ::rtl::OUString( sName );
}
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index e6c83ed..d8a574d 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -117,7 +117,7 @@ sal_Int32 SAL_CALL RangePageBreaks::getCount( ) throw (uno::RuntimeException)
{
sal_Int32 nPos = aTablePageBreakData[i].Position;
- // VBA. minz@cn.ibm.com. All page breaks before the used range should be counted.
+ // All page breaks before the used range should be counted.
// And the page break at the end of the used range also should be counted.
if( nPos <= nUsedEnd + 1 )
nCount++;
@@ -154,7 +154,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI
uno::Sequence<sheet::TablePageBreakData> aTablePageBreakDataList = getAllPageBreaks();
sal_Int32 nLength = aTablePageBreakDataList.getLength();
- //VBA. minz@cn.ibm.com. No need to filter the page break. All page breaks before the used
range are counted.
+ // No need to filter the page break. All page breaks before the used range are counted.
if ( nAPIItemIndex < nLength && nAPIItemIndex>=0 )
aTablePageBreakData = aTablePageBreakDataList[nAPIItemIndex];
diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx
index 749cb33..f03ee70 100644
--- a/sc/source/ui/vba/vbapagesetup.cxx
+++ b/sc/source/ui/vba/vbapagesetup.cxx
@@ -630,8 +630,6 @@ ScVbaPageSetup::getServiceNames()
return aServiceNames;
}
-//liuchen 2009-12-11
-
struct PaperSizeMap
{
Paper ePaper;
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index 9fc3a5b..a3b27f0 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -83,8 +83,8 @@ public:
virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw
(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException);
virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw
(css::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException); //liuchen
2009-12-11
- virtual void SAL_CALL setPaperSize( sal_Int32 paperSize ) throw (css::uno::RuntimeException);
//liuchen 2009-12-11
+ virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setPaperSize( sal_Int32 paperSize ) throw (css::uno::RuntimeException);
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 8eaa0a0..7f67ce7 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2001,7 +2001,6 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
uno::Any aMatrix;
- //VBA, minz@cn.ibm.com
uno::Sequence< uno::Sequence<rtl::OUString> > aFmArray = xCellRangeFormula->getFormulaArray();
if( aFmArray.getLength() )
{
@@ -2569,7 +2568,6 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
}
- //VBA, minz@cn.ibm.com.
else {
uno::Reference< frame::XModel > xModel = excel::GetModelFromRange( mxRange );
Select();
@@ -3139,8 +3137,8 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString&
Replace
if ( xIndexAccess.is() && xIndexAccess->getCount() > 0 )
{
// Fires the range change event.
- ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation(
xIndexAccess ); //liuchen 2010-01-05
- lcl_NotifyRangeChanges( getScDocShell()->GetModel(), pScCellRangesBase ); //liuchen
2010-01-05 the original convert method will fail in SUSE
+ ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation(
xIndexAccess );
+ lcl_NotifyRangeChanges( getScDocShell()->GetModel(), pScCellRangesBase ); // the
original convert method will fail in SUSE
}
}
return sal_True; // always
@@ -5184,18 +5182,17 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw (
css::uno::Ru
}
}
-//09-09-16 add by limingl
::com::sun::star::uno::Reference< ::ooo::vba::excel::XQueryTable > SAL_CALL
ScVbaRange::getQueryTable() throw (::com::sun::star::uno::RuntimeException)
{
if (!m_xQueryTable.is())
{
- m_xQueryTable = new ScVbaQueryTable(mxParent ,mxContext, getScDocument(), this); //add by
limingl
+ m_xQueryTable = new ScVbaQueryTable(mxParent ,mxContext, getScDocument(), this);
}
return m_xQueryTable;
}
-//end add
+
uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException)
{
@@ -5225,7 +5222,6 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException,
uno::RuntimeExceptio
return new ScVbaRange( mxParent, mxContext, mxRange );
}
-//2008-08-25 add by limingl
//The recordset's member: Recordset.Fields.Item will get a Field obj.
//Field.value is the column value.
::sal_Int32 SAL_CALL
@@ -5335,7 +5331,7 @@ throw (::com::sun::star::script::BasicErrorException,
::com::sun::star::uno::Run
return 0;
}
-//end add
+
void SAL_CALL
ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const
uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any&
Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
{
@@ -6106,7 +6102,7 @@ uno::Any SAL_CALL ScVbaRange::AdvancedFilter( sal_Int32 Action, const
uno::Any&
return aRet;
}
-//Add by minz@cn.ibm.com. Range.PivotTable.
+//Range.PivotTable.
//Returns a PivotTable object that represents the PivotTable report containing the upper-left
corner of the specified range.
uno::Reference< excel::XPivotTable >
ScVbaRange::PivotTable() throw (uno::RuntimeException)
@@ -6127,8 +6123,6 @@ ScVbaRange::PivotTable() throw (uno::RuntimeException)
xSheet = thisRange.getSpreadSheet();
}
-// RangeHelper thisRange( mxRange );
-// uno::Reference< sheet::XSpreadsheet > xSheet = thisRange.getSpreadSheet();
uno::Reference< sheet::XDataPilotTablesSupplier > xTables(xSheet, uno::UNO_QUERY_THROW ) ;
uno::Reference< container::XIndexAccess > xIndexAccess( xTables->getDataPilotTables(),
uno::UNO_QUERY_THROW );
if ( xIndexAccess.is() )
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index cb31b3c..8a5bb0a 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -52,7 +52,7 @@
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
#include <com/sun/star/table/CellAddress.hpp>
-#include "vbaquerytable.hxx" //09-09-18 add by limingl
+#include "vbaquerytable.hxx"
#include "vbaformat.hxx"
#include <formula/grammar.hxx>
@@ -101,7 +101,7 @@ class ScVbaRange : public ScVbaRange_BASE
sal_Bool mbIsRows;
sal_Bool mbIsColumns;
css::uno::Reference< ov::excel::XValidation > m_xValidation;
- css::uno::Reference<excel::XQueryTable> m_xQueryTable; //09-09-16 add by limingl
+ css::uno::Reference<excel::XQueryTable> m_xQueryTable;
double getCalcColWidth( const css::table::CellRangeAddress& ) throw
(css::uno::RuntimeException);
double getCalcRowHeight( const css::table::CellRangeAddress& ) throw
(css::uno::RuntimeException);
void visitArray( ArrayVisitor& vistor );
@@ -195,7 +195,7 @@ public:
virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException);
virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw
(css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::ooo::vba::excel::XQueryTable > SAL_CALL
getQueryTable() throw (::com::sun::star::uno::RuntimeException); //09-09-16 add by limingl
+ virtual ::com::sun::star::uno::Reference< ::ooo::vba::excel::XQueryTable > SAL_CALL
getQueryTable() throw (::com::sun::star::uno::RuntimeException);
// Methods
sal_Bool IsRows() const { return mbIsRows; }
sal_Bool IsColumns() const { return mbIsColumns; }
@@ -275,7 +275,7 @@ public:
virtual css::uno::Reference< ov::excel::XPivotTable > SAL_CALL PivotTable( ) throw
(css::uno::RuntimeException);
- virtual ::sal_Int32 SAL_CALL CopyFromRecordset( const ::com::sun::star::uno::Any& Data, const
::com::sun::star::uno::Any& MaxRows, const ::com::sun::star::uno::Any& MaxColumns ) throw
(::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException);
//2008-08-25 add by limingl
+ virtual ::sal_Int32 SAL_CALL CopyFromRecordset( const ::com::sun::star::uno::Any& Data, const
::com::sun::star::uno::Any& MaxRows, const ::com::sun::star::uno::Any& MaxColumns ) throw
(::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException);
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw
(css::uno::RuntimeException);
// XElementAccess
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 229e8f4..5d15c27 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -295,13 +295,13 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const
un
xProps->setPropertyValue( ALERTSTYLE, uno::makeAny( eStyle ) );
- //2009-11-11 fix the defect that validatation cannot work when the input should be limited
between a lower bound and an upper bound
+ // fix the defect that validatation cannot work when the input should be limited between a
lower bound and an upper bound
if ( Operator.hasValue() )
{
css::sheet::ConditionOperator conOperator = ScVbaFormatCondition::retrieveAPIOperator(
Operator );
xCond->setOperator( conOperator );
}
- //2009-11-11
+
if ( sFormula1.getLength() )
xCond->setFormula1( sFormula1 );
if ( sFormula2.getLength() )
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 1af4fee..a93db91 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <ooo/vba/excel/XlFileFormat.hpp>
-#include <ooo/vba/excel/XApplication.hpp> //liuchen 2009-12-16
+#include <ooo/vba/excel/XApplication.hpp>
#include "scextopt.hxx"
#include "vbaworksheet.hxx"
@@ -49,7 +49,7 @@
#include "vbapalette.hxx"
#include <osl/file.hxx>
#include <stdio.h>
-#include "vbanames.hxx" // Amelia Wang
+#include "vbanames.hxx"
#include "nameuno.hxx"
#include "docoptio.hxx"
#include "unonames.hxx"
@@ -187,7 +187,7 @@ ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException)
return aFileFormat;
}
-//VBA by minz@cn.ibm.com. Convert Excel fileformat to OO file filter
+// Convert Excel fileformat to OO file filter
::rtl::OUString ScVbaWorkbook::convertFileFormat(sal_Int32 aFileFormat)
{
rtl::OUString aFilterName;
@@ -325,13 +325,13 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw (
uno::Runtime
xStor->storeToURL( aURL, storeProps );
}
-//VBA by minz@cn.ibm.com. Add Workbook.SaveAs.
+// Add Workbook.SaveAs.
void
ScVbaWorkbook::SaveAs( const rtl::OUString& FileName, const uno::Any& FileFormat, const uno::Any&
/*CreateBackup*/ ) throw ( uno::RuntimeException)
{
rtl::OUString aURL;
osl::FileBase::getFileURLFromSystemPath( FileName, aURL );
- //liuchen 2009-12-16 if the input parameter "FileName" takes the form as "MyFile", we need to
get the current directory and combine the current directory and the file name
+ //if the input parameter "FileName" takes the form as "MyFile", we need to get the current
directory and combine the current directory and the file name
INetURLObject aFileNameURL( aURL );
aURL = aFileNameURL.GetMainURL( INetURLObject::NO_DECODE );
if ( aURL.getLength() == 0 )
@@ -344,7 +344,7 @@ ScVbaWorkbook::SaveAs( const rtl::OUString& FileName, const uno::Any& FileFormat
aPathURL.Append( FileName );
aURL = aPathURL.GetMainURL( INetURLObject::NO_DECODE );
}
- //liuchen 2009-12-16
+
uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW );
sal_Int32 aFileFormat = excel::XlFileFormat::xlExcel9795;
@@ -381,7 +381,6 @@ ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
return uno::makeAny( dStyles );
}
-// Amelia Wang
uno::Any SAL_CALL
ScVbaWorkbook::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
{
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 7d4701e..51a2292 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -96,7 +96,7 @@
#include "vbaworksheets.hxx"
#include "vbahyperlinks.hxx"
#include "vbasheetobjects.hxx"
-#include "viewuno.hxx" //liuchen 2009-9-2
+#include "viewuno.hxx"
#define STANDARDWIDTH 2267
#define STANDARDHEIGHT 427
@@ -247,7 +247,6 @@ ScVbaWorksheet::setVisible( ::sal_Int32 _Visible ) throw (uno::RuntimeException)
{
uno::Reference< beans::XPropertySet > xProps( getSheet(), uno::UNO_QUERY_THROW );
- //VBA by minz@cn.ibm.com.
sal_Bool bVisible = true;
switch( _Visible )
{
@@ -479,7 +478,7 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException)
xSpreadsheet->setActiveSheet(getSheet());
}
-//liuchen 2009-9-2, support expand (but not replace) the active sheet
+// support expand (but not replace) the active sheet
void
ScVbaWorksheet::Select(const css::uno::Any& aReplace) throw (uno::RuntimeException)
{
@@ -651,7 +650,7 @@ ScVbaWorksheet::getSheetAtOffset(SCTAB offset) throw (uno::RuntimeException)
uno::Reference< excel::XWorksheet >
ScVbaWorksheet::getNext() throw (uno::RuntimeException)
{
- //VBA, minz@cn.ibm.com. catch the exception for index out of bound
+ // catch the exception for index out of bound
try{
return getSheetAtOffset(static_cast<SCTAB>(1));
}catch( lang::IndexOutOfBoundsException& /*e*/ )
@@ -663,7 +662,7 @@ ScVbaWorksheet::getNext() throw (uno::RuntimeException)
uno::Reference< excel::XWorksheet >
ScVbaWorksheet::getPrevious() throw (uno::RuntimeException)
{
- //VBA, minz@cn.ibm.com. catch the exception for index out of bound
+ // catch the exception for index out of bound
try{
return getSheetAtOffset(-1);
}catch( lang::IndexOutOfBoundsException& /*e*/ )
@@ -753,7 +752,7 @@ ScVbaWorksheet::ChartObjects( const uno::Any& Index ) throw (uno::RuntimeExcepti
uno::Reference< table::XTableChartsSupplier > xChartSupplier( getSheet(),
uno::UNO_QUERY_THROW );
uno::Reference< table::XTableCharts > xTableCharts = xChartSupplier->getCharts();
- uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getSheet(),
uno::UNO_QUERY_THROW ); //VBA, minz@cn.ibm.com.
+ uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier( getSheet(),
uno::UNO_QUERY_THROW );
mxCharts = new ScVbaChartObjects( this, mxContext, xTableCharts, xDrawPageSupplier );
}
if ( Index.hasValue() )
@@ -1072,7 +1071,7 @@ ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException)
sal_Int16
ScVbaWorksheet::getSheetID() throw (uno::RuntimeException)
{
- uno::Reference< sheet::XCellRangeAddressable > xAddressable( getSheet(), uno::UNO_QUERY_THROW
); //VBA. minz@cn.ibm.com. if ActiveSheet, mxSheet is null.
+ uno::Reference< sheet::XCellRangeAddressable > xAddressable( getSheet(), uno::UNO_QUERY_THROW
); // if ActiveSheet, mxSheet is null.
return xAddressable->getRangeAddress().Sheet;
}
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index b27bf99..d8fe20e 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -117,7 +117,7 @@ public:
// Methods
virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
- virtual void SAL_CALL Select(const css::uno::Any& aReplace) throw
(css::uno::RuntimeException); //liuchen 2009-9-2, add the input parameter to support expand
selection
+ virtual void SAL_CALL Select(const css::uno::Any& aReplace) throw
(css::uno::RuntimeException); // add the input parameter to support expand selection
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1,
const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw
(css::uno::RuntimeException) ;
virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw
(css::uno::RuntimeException);
--
1.7.3.5
From e2216caf88f1e34422f77ee5e64319d6575ca1d1 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 18:42:32 +0100
Subject: [PATCH 5/7] Removed commit notes. Thanks to PengYunQuan.
---
sc/inc/scabstdlg.hxx | 8 +-------
sc/inc/scmod.hxx | 8 ++------
sc/sdi/scalc.sdi | 2 --
sc/source/ui/app/scdll.cxx | 8 --------
sc/source/ui/attrdlg/scdlgfact.cxx | 6 ------
sc/source/ui/docshell/docsh.cxx | 2 --
sc/source/ui/inc/docsh.hxx | 4 ++--
sc/source/ui/inc/reffact.hxx | 2 --
sc/source/ui/miscdlgs/anyrefdg.cxx | 6 +-----
sc/source/ui/view/cellsh2.cxx | 4 ----
sc/source/ui/view/reffact.cxx | 14 --------------
sc/source/ui/view/tabvwsh.cxx | 3 ---
12 files changed, 6 insertions(+), 61 deletions(-)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 3584805..2807e22 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -56,9 +56,7 @@ class SfxStyleSheetBase;
class ScDPObject;
struct ScDPFuncData;
struct ScDPNumGroupInfo;
-//<!--Added by PengYunQuan for Validity Cell Range Picker
class ScTabViewShell;
-//-->Added by PengYunQuan for Validity Cell Range Picker
namespace com { namespace sun { namespace star { namespace sheet {
struct DataPilotFieldReference;
@@ -502,13 +500,9 @@ public:
virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr
,//add for ScParagraphDlg
int nId ) = 0;
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for
ScValidationDlg
- //
const SfxItemSet* pArgSet,int nId ) = 0;
-
virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for
ScValidationDlg
const SfxItemSet* pArgSet,int nId,
ScTabViewShell *pTabVwSh ) = 0;
- //-->Modified by PengYunQuan for Validity Cell Range Picker
+
virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for
ScSortDlg
const SfxItemSet* pArgSet,int nId ) = 0;
// for tabpage
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 313bb9f..4d81888 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -39,11 +39,9 @@
#include <unotools/options.hxx>
#include <tools/shl.hxx>
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#include <map>
#include <list>
#include <algorithm>
-//-->Added by PengYunQuan for Validity Cell Range Picker
class KeyEvent;
@@ -147,9 +145,8 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener
bool mbIsInSharedDocLoading;
bool mbIsInSharedDocSaving;
- //<!--Added by PengYunQuan for Validity Cell Range Picker
std::map<USHORT, std::list<Window*> > m_mapRefWindow;
- //-->Added by PengYunQuan for Validity Cell Range Picker
+
public:
SFX_DECL_INTERFACE(SCID_APP)
@@ -259,9 +256,8 @@ SC_DLLPUBLIC void SetAppOptions (
const ScAppOptions& rOpt );
ScFormEditData* GetFormEditData() { return pFormEditData; }
// Referenzeingabe:
- //<!--Added by PengYunQuan for Validity Cell Range Picker
SC_DLLPUBLIC void SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame*
pViewFrm = NULL );
- //-->Added by PengYunQuan for Validity Cell Range Picker
+
BOOL IsModalMode(SfxObjectShell* pDocSh = NULL);
BOOL IsFormulaMode();
BOOL IsRefDialogOpen();
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 0628d84..5b8b3cc 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -2802,7 +2802,6 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER
]
//--------------------------------------------------------------------------
-//<!--Added by PengYunQuan for Validity Cell Range Picker
SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
()
[
@@ -2826,7 +2825,6 @@ SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE
ToolBoxConfig = TRUE,
GroupId = GID_OPTIONS;
]
-//-->Added by PengYunQuan for Validity Cell Range Picker
//--------------------------------------------------------------------------
SfxVoidItem GoDownToEndOfData SID_CURSORBLKDOWN
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 0d39cf8..77c9999 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -205,7 +205,6 @@ void ScDLL::Init()
SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod);
SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY,
pMod);
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
-// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT,
pMod);
SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR,
pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER,
pMod);
@@ -294,20 +293,13 @@ void ScDLL::Init()
ScSpellDialogChildWindow ::RegisterChildWindow(FALSE, pMod);
::avmedia::MediaPlayer ::RegisterChildWindow(FALSE, pMod);
- //<!--Added by PengYunQuan for Validity Cell Range Picker
ScValidityRefChildWin::RegisterChildWindow(FALSE, pMod);
- //-->Added by PengYunQuan for Validity Cell Range Picker
// Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
-// rClassManager.SV_CLASS_REGISTER( SvxURLField );
-// rClassManager.SV_CLASS_REGISTER( SvxDateField );
-// rClassManager.SV_CLASS_REGISTER( SvxPageField );
rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-// rClassManager.SV_CLASS_REGISTER( SvxTimeField );
rClassManager.SV_CLASS_REGISTER( SvxFileField );
-// rClassManager.SV_CLASS_REGISTER( SvxExtFileField );
rClassManager.SV_CLASS_REGISTER( SvxTableField );
SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index c7f8a46..37bfa7f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1534,19 +1534,13 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg(
Windo
//add for ScValidationDlg begin
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent,
-//<!--Modified by PengYunQuan for Validity Cell Range Picker
-//
const SfxItemSet* pArgSet,int nId )
const SfxItemSet* pArgSet,int nId,
ScTabViewShell *pTabVwSh )
-//-->Modified by PengYunQuan for Validity Cell Range Picke
{
SfxTabDialog* pDlg=NULL;
switch ( nId )
{
case TAB_DLG_VALIDATION :
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //pDlg = new ScValidationDlg( pParent, pArgSet );
pDlg = new ScValidationDlg( pParent, pArgSet, pTabVwSh );
- //-->Modified by PengYunQuan for Validity Cell Range Picker
break;
default:
break;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1163400..e340124 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2929,7 +2929,6 @@ void ScDocShellModificator::SetDocumentModified()
}
}
-//<!--Added by PengYunQuan for Validity Cell Range Picker
sal_Bool ScDocShell::AcceptStateUpdate() const
{
if( SfxObjectShell::AcceptStateUpdate() )
@@ -2940,7 +2939,6 @@ sal_Bool ScDocShell::AcceptStateUpdate() const
return sal_False;
}
-//-->Added by PengYunQuan for Validity Cell Range Picker
bool ScDocShell::IsChangeRecording() const
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 196f466..71cee64 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -427,9 +427,9 @@ public:
const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be
null
void SetSolverSaveData( const ScOptSolverSave& rData );
- //<!--Added by PengYunQuan for Validity Cell Range Picker
+
sal_Bool AcceptStateUpdate() const;
- //-->Added by PengYunQuan for Validity Cell Range Picker
+
ScSheetSaveData* GetSheetSaveData();
void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType );
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index cc09603..e3b5236 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -100,7 +100,6 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
void StartRefInput();
};
-//<!--Added by PengYunQuan for Validity Cell Range Picker
class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow
{
bool m_bVisibleLock:1;
@@ -115,7 +114,6 @@ public:
void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); }
void Show( USHORT nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags
); }
};
-//-->Added by PengYunQuan for Validity Cell Range Picker
//==================================================================
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index e5d05b9..b4b6d9b 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -368,10 +368,7 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel )
//----------------------------------------------------------------------------
void ScFormulaReferenceHelper::RefInputDone( BOOL bForced )
{
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //if (pRefEdit && (bForced || !pRefBtn))
- if ( CanInputDone( bForced ) )//if (pRefEdit && (bForced || !pRefBtn))
- //-->Modified by PengYunQuan for Validity Cell Range Picker
+ if ( CanInputDone( bForced ) )
{
if (bAccInserted) // Accelerator wieder abschalten
{
@@ -668,7 +665,6 @@ void lcl_HideAllReferences()
}
//============================================================================
-//The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker
// class ScRefHandler
//----------------------------------------------------------------------------
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 2934a15..bb4aea2 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -196,7 +196,6 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
return bSort;
}
-//<!-- Added by PengYunQuan for Validity Cell Range Picker
//after end execute from !IsModalInputMode, it is safer to delay deleting
namespace
{
@@ -206,7 +205,6 @@ namespace
return 0;
}
}
-//--> Added by PengYunQuan for Validity Cell Range Picker
void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
@@ -1131,11 +1129,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
pTabViewShell->SetValidation( aData );
rReq.Done( *pOutSet );
}
- //<!-- Modified by PengYunQuan for Validity Cell Range Picker
//after end execute from !IsModalInputMode, it is safer to delay deleting
//delete pDlg;
Application::PostUserEvent( Link( pDlg, &DelayDeleteAbstractDialog ) );
- //--> Modified by PengYunQuan for Validity Cell Range Picker
}
}
break;
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index fde082b..5270a84 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -45,9 +45,7 @@
#include "acredlin.hxx"
#include "simpref.hxx"
#include "scmod.hxx"
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#include "validate.hxx"
-//<!--Added by PengYunQuan for Validity Cell Range Picker
// -----------------------------------------------------------------------
@@ -67,13 +65,6 @@ SFX_IMPL_MODELESSDIALOG(ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
SFX_IMPL_MODELESSDIALOG(ScAcceptChgDlgWrapper, FID_CHG_ACCEPT )
SFX_IMPL_MODELESSDIALOG(ScHighlightChgDlgWrapper, FID_CHG_SHOW )
SFX_IMPL_MODELESSDIALOG(ScSimpleRefDlgWrapper, WID_SIMPLE_REF )
-/*!!! dafuer muss der Funktionsautopilot noch umgebaut werden
-SFX_IMPL_CHILDWINDOW(ScFunctionDlgWrapper, SID_OPENDLG_FUNCTION )
-SFX_IMPL_CHILDWINDOW(ScEditFunctionDlgWrapper, SID_OPENDLG_EDITFUNCTION )
-SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT )
-*/
-//<!--Added by PengYunQuan for Validity Cell Range Picker
-//SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE )
SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
{
@@ -92,7 +83,6 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
}
namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
-//<!--Added by PengYunQuan for Validity Cell Range Picker
#define IMPL_CHILD_CTOR(Class,sid) \
Class::Class( Window* pParentP,
\
@@ -101,7 +91,6 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
SfxChildWinInfo* pInfo ) \
: SfxChildWindow(pParentP, nId)
\
{
\
- /*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\
/************************************************************************************/\
/* When a new document is creating, the SfxViewFrame may be ready,
*/\
/* But the ScTabViewShell may have not been activated yet. In this
*/\
@@ -109,7 +98,6 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
/* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current()
*/\
/************************************************************************************/\
ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \
- /*//-->Added by PengYunQuan for Validity Cell Range Picker*/\
if (!pViewShell) \
pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \
DBG_ASSERT( pViewShell, "missing view shell :-(" ); \
@@ -362,7 +350,6 @@ void ScAcceptChgDlgWrapper::ReInitDlg()
IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW )
-//<!--Added by PengYunQuan for Validity Cell Range Picker
namespace
{
ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings )
@@ -408,6 +395,5 @@ ScValidityRefChildWin::~ScValidityRefChildWin()
if( m_bFreeWindowLock )
pWindow = NULL;
}
-//-->Added by PengYunQuan for Validity Cell Range Picker
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index fdbd07b..f0ecfdc 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -97,10 +97,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSpellDialogChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION( ::avmedia::MediaPlayer::GetChildWindowId() );
-
- //<!--Added by PengYunQuan for Validity Cell Range Picker
SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId());
- //-->Added by PengYunQuan for Validity Cell Range Picker
}
SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
--
1.7.3.5
From 3d3bd97e6a1c84f1d8288a1bf581920f70826c4d Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 18:44:39 +0100
Subject: [PATCH 6/7] Remove commit message. Thanks to zhaosz and weihuaw.
---
sc/source/core/data/dptablecache.cxx | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx
index 3ab1e4a..35f8477 100644
--- a/sc/source/core/data/dptablecache.cxx
+++ b/sc/source/core/data/dptablecache.cxx
@@ -700,10 +700,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam,
boo
if (bMatchWholeCell)
{
bOk = pTransliteration->isEqual( aCellStr, *rEntry.pStr );
- //Added by zhaosz,for sodc_2702,20060808
- String aStr = *rEntry.pStr;//"f*"
- //modified by weihuaw,for SODC_16698
- //use another way to find "*" in aStr
+ String aStr = *rEntry.pStr;
sal_Bool bHasStar = sal_False;
xub_StrLen nIndex;
if (( nIndex = aStr.Search('*') ) != STRING_NOTFOUND)
@@ -723,8 +720,6 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, boo
}
}
}
- //end modified
- //Added end,20060808
}
else
{
--
1.7.3.5
From bfcb9e612b353d23d607611940583003d002f957 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 17 Jan 2011 19:23:43 +0100
Subject: [PATCH 7/7] Remove useless comments and some dead code.
---
.../accessibility/AccStatisticsObject.cxx | 19 ---------
.../controller/accessibility/AccessibleBase.cxx | 30 +-------------
.../accessibility/AccessibleChartView.cxx | 2 -
.../accessibility/AccessibleTextHelper.cxx | 6 ---
.../controller/chartapiwrapper/AreaWrapper.cxx | 3 -
.../controller/chartapiwrapper/AxisWrapper.cxx | 1 -
.../chartapiwrapper/ChartDocumentWrapper.cxx | 10 +---
.../chartapiwrapper/DataSeriesPointWrapper.cxx | 1 -
.../controller/chartapiwrapper/DiagramWrapper.cxx | 6 +--
.../controller/chartapiwrapper/GridWrapper.cxx | 1 -
.../controller/chartapiwrapper/LegendWrapper.cxx | 3 -
.../chartapiwrapper/MinMaxLineWrapper.cxx | 8 ----
.../controller/chartapiwrapper/TitleWrapper.cxx | 3 -
.../chartapiwrapper/UpDownBarWrapper.cxx | 8 ----
.../chartapiwrapper/WallFloorWrapper.cxx | 3 -
.../chartapiwrapper/WrappedStockProperties.cxx | 3 +-
.../dialogs/ChartTypeDialogController.cxx | 3 +-
.../controller/dialogs/dlg_CreationWizard_UNO.cxx | 4 --
.../controller/dialogs/tp_3D_SceneAppearance.cxx | 6 +--
chart2/source/controller/main/ChartController.cxx | 9 +---
.../controller/main/ChartController_EditData.cxx | 2 -
.../controller/main/ChartController_Properties.cxx | 4 +-
.../source/controller/main/UndoCommandDispatch.cxx | 2 -
chart2/source/inc/OPropertySet.hxx | 37 -----------------
chart2/source/model/main/Axis.cxx | 13 ------
chart2/source/model/main/BaseCoordinateSystem.cxx | 5 --
chart2/source/model/main/ChartModel.cxx | 18 --------
chart2/source/model/main/DataPoint.cxx | 3 -
chart2/source/model/main/DataSeries.cxx | 5 --
chart2/source/model/main/Diagram.cxx | 5 --
chart2/source/model/main/FormattedString.cxx | 7 ---
chart2/source/model/main/GridProperties.cxx | 5 --
chart2/source/model/main/Legend.cxx | 5 --
chart2/source/model/main/PageBackground.cxx | 5 --
chart2/source/model/main/StockBar.cxx | 5 --
chart2/source/model/main/Title.cxx | 5 --
chart2/source/model/main/Wall.cxx | 5 --
.../model/template/AreaChartTypeTemplate.cxx | 5 --
.../source/model/template/BarChartTypeTemplate.cxx | 5 --
chart2/source/model/template/BubbleChartType.cxx | 5 --
.../model/template/BubbleChartTypeTemplate.cxx | 5 --
.../source/model/template/CandleStickChartType.cxx | 7 +---
chart2/source/model/template/ChartType.cxx | 2 -
chart2/source/model/template/ColumnChartType.cxx | 6 ---
.../model/template/ColumnLineChartTypeTemplate.cxx | 5 --
chart2/source/model/template/LineChartType.cxx | 5 --
.../model/template/LineChartTypeTemplate.cxx | 5 --
chart2/source/model/template/NetChartType.cxx | 2 -
chart2/source/model/template/PieChartType.cxx | 5 --
chart2/source/model/template/ScatterChartType.cxx | 13 ------
.../model/template/ScatterChartTypeTemplate.cxx | 5 --
.../model/template/StockChartTypeTemplate.cxx | 5 --
chart2/source/tools/CachedDataSequence.cxx | 15 -------
chart2/source/tools/DataSourceHelper.cxx | 3 +-
chart2/source/tools/ErrorBar.cxx | 5 --
chart2/source/tools/RegressionCurveModel.cxx | 5 --
chart2/source/tools/RegressionEquation.cxx | 18 --------
chart2/source/tools/UncachedDataSequence.cxx | 8 ----
chart2/source/tools/WrappedPropertySet.cxx | 9 ----
chart2/source/view/main/ChartView.cxx | 42 --------------------
60 files changed, 16 insertions(+), 429 deletions(-)
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index 1285ef6..4bb9885 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -40,27 +40,8 @@ namespace chart
AccStatisticsObject::AccStatisticsObject( const AccessibleElementInfo& rAccInfo )
: AccessibleChartElement( rAccInfo, false/*NoChildren*/, true/*AlwaysTransparent*/ )
- //, m_eType( eType )
- //, m_nSeriesIndex( nSeriesIndex )
{
-// ChartModel * pModel = GetChartModel();
-// OSL_ASSERT( pModel );
-
- // /-- solar
SolarMutexGuard aSolarGuard;
-/* switch( eType )
- {
- case MEAN_VAL_LINE:
- SetItemSet( pModel->GetAverageAttr( m_nSeriesIndex ));
- break;
- case ERROR_BARS:
- SetItemSet( pModel->GetErrorAttr( m_nSeriesIndex ));
- break;
- case REGRESSION:
- SetItemSet( pModel->GetRegressAttr( m_nSeriesIndex ));
- break;
- }*/
- // \-- solar
}
AccStatisticsObject::~AccStatisticsObject()
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 1bc5425..c35e6f0 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -200,12 +200,11 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const
AccessibleUniqueId
else if( m_bMayHaveChildren )
{
bool bStop = false;
- // /--
+
ClearableMutexGuard aGuard( GetMutex() );
// make local copy for notification
ChildListVectorType aLocalChildList( m_aChildList );
aGuard.clear();
- // \--
ChildListVectorType::iterator aEndIter = aLocalChildList.end();
for( ChildListVectorType::iterator aIter = aLocalChildList.begin() ;
@@ -245,7 +244,6 @@ bool AccessibleBase::UpdateChildren()
{
bool bMustUpdateChildren = false;
{
- // /--
MutexGuard aGuard( GetMutex() );
if( ! m_bMayHaveChildren ||
m_bIsDisposed )
@@ -253,7 +251,6 @@ bool AccessibleBase::UpdateChildren()
bMustUpdateChildren = ( m_bMayHaveChildren &&
! m_bChildrenInitialized );
- // \--
}
// update unguarded
@@ -319,7 +316,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild )
OSL_ENSURE( pChild != NULL, "Invalid Child" );
if( pChild )
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
Reference< XAccessible > xChild( pChild );
@@ -334,10 +330,8 @@ void AccessibleBase::AddChild( AccessibleBase * pChild )
aNew <<= xChild;
aGuard.clear();
- // \-- (1st)
BroadcastAccEvent( AccessibleEventId::CHILD, aNew, aEmpty );
}
- // \-- (2nd)
}
}
@@ -346,7 +340,6 @@ void AccessibleBase::AddChild( AccessibleBase * pChild )
*/
void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId )
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
ChildOIDMap::iterator aIt( m_aChildOIDMap.find( rOId ));
@@ -370,7 +363,6 @@ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId )
// call listeners unguarded
aGuard.clear();
- // \-- (1st)
// inform listeners of removed child
if( bInitialized )
@@ -393,11 +385,9 @@ awt::Point AccessibleBase::GetUpperLeftOnScreen() const
awt::Point aResult;
if( m_aAccInfo.m_pParent )
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
AccessibleBase * pParent = m_aAccInfo.m_pParent;
aGuard.clear();
- // \--
if( pParent )
{
@@ -416,7 +406,6 @@ void AccessibleBase::BroadcastAccEvent(
const Any & rOld,
bool bSendGlobally ) const
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
if ( !m_nEventNotifierId && !bSendGlobally )
@@ -434,7 +423,6 @@ void AccessibleBase::BroadcastAccEvent(
::comphelper::AccessibleEventNotifier::addEvent( m_nEventNotifierId, aEvent );
aGuard.clear();
- // \--
// send event to global message queue
if( bSendGlobally )
@@ -445,7 +433,6 @@ void AccessibleBase::BroadcastAccEvent(
void AccessibleBase::KillAllChildren()
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
// make local copy for notification
@@ -456,7 +443,6 @@ void AccessibleBase::KillAllChildren()
m_aChildOIDMap.clear();
aGuard.clear();
- // \--
// call dispose for all children
// and notify listeners
@@ -507,7 +493,6 @@ AccessibleUniqueId AccessibleBase::GetId() const
// ________ (XComponent::dispose) ________
void SAL_CALL AccessibleBase::disposing()
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
OSL_ENSURE( ! m_bIsDisposed, "dispose() called twice" );
@@ -536,7 +521,6 @@ void SAL_CALL AccessibleBase::disposing()
// call listeners unguarded
aGuard.clear();
- // \--
if( m_bMayHaveChildren )
{
@@ -557,7 +541,6 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
throw (RuntimeException)
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
if( ! m_bMayHaveChildren ||
m_bIsDisposed )
@@ -567,7 +550,6 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
! m_bChildrenInitialized );
aGuard.clear();
- // \--
// update unguarded
if( bMustUpdateChildren )
@@ -588,13 +570,11 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild(
sal_Int32
CheckDisposeState();
Reference< XAccessible > xResult;
- // /--
ResettableMutexGuard aGuard( GetMutex() );
bool bMustUpdateChildren = ( m_bMayHaveChildren &&
! m_bChildrenInitialized );
aGuard.clear();
- // \--
if( bMustUpdateChildren )
UpdateChildren();
@@ -602,14 +582,13 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild(
sal_Int32
xResult.set( ImplGetAccessibleChildById( i ));
return xResult;
- // \--
}
Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const
throw (lang::IndexOutOfBoundsException, RuntimeException)
{
Reference< XAccessible > xResult;
- // /--
+
MutexGuard aGuard( GetMutex());
if( ! m_bMayHaveChildren ||
i < 0 ||
@@ -727,11 +706,9 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const
aw
if( ( aRect.X <= aPoint.X && aPoint.X <= (aRect.X + aRect.Width) ) &&
( aRect.Y <= aPoint.Y && aPoint.Y <= (aRect.Y + aRect.Height)))
{
- // /--
ClearableMutexGuard aGuard( GetMutex() );
ChildListVectorType aLocalChildList( m_aChildList );
aGuard.clear();
- // \--
Reference< XAccessibleComponent > aComp;
for( ChildListVectorType::const_iterator aIter = aLocalChildList.begin();
@@ -768,7 +745,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
Rectangle aRect( aLogicRect.X, aLogicRect.Y,
aLogicRect.X + aLogicRect.Width,
aLogicRect.Y + aLogicRect.Height );
- // /-- solar
+
SolarMutexGuard aSolarGuard;
aRect = pWindow->LogicToPixel( aRect );
@@ -785,7 +762,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
return awt::Rectangle( aRect.getX() - aOffset.X, aRect.getY() - aOffset.Y,
aRect.getWidth(), aRect.getHeight());
- // \-- solar
}
}
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx
b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 1b3280f..062309d 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -98,12 +98,10 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const
Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow ));
if( pWindow )
{
- // /-- solar
SolarMutexGuard aSolarGuard;
Point aVCLPoint( pWindow->OutputToAbsoluteScreenPixel( Point( 0, 0 ) ));
aBBox.X = aVCLPoint.getX();
aBBox.Y = aVCLPoint.getY();
- // \-- solar
}
return aBBox;
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 8f15795..c1b8523 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -86,7 +86,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
if( !xEventSource.is() || aCID.getLength() == 0 )
return;
- // /-- solar
SolarMutexGuard aSolarGuard;
if( m_pTextHelper )
@@ -111,7 +110,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
}
OSL_ENSURE( m_pTextHelper, "Couldn't create text helper" );
- // \-- solar
}
// ____ XAccessibleContext ____
@@ -120,10 +118,8 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >&
aArg
{
if( m_pTextHelper )
{
- // /-- solar
SolarMutexGuard aSolarGuard;
return m_pTextHelper->GetChildCount();
- // \-- solar
}
return 0;
}
@@ -134,10 +130,8 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild(
::sa
{
if( m_pTextHelper )
{
- // /-- solar
SolarMutexGuard aSolarGuard;
return m_pTextHelper->GetChild( i );
- // \-- solar
}
return Reference< XAccessible >();
}
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index cb92ec6..b376976 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -62,7 +62,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -141,10 +140,8 @@ void SAL_CALL AreaWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
clearWrappedPropertySet();
- // \--
}
void SAL_CALL AreaWrapper::addEventListener(
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 647ad53..0423efb 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -328,7 +328,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d7d24fc..bb3df49 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -254,7 +254,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -869,10 +868,9 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >&
x
if( !xNewData.is() )
return;
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( Reference< frame::XModel >(
m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY ));
m_xChartData.set( new ChartDataWrapper( m_spChart2ModelContact, xNewData ) );
- // \-- locked controllers
}
// ____ XModel ____
@@ -1330,7 +1328,7 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartDocumentWrapper::createInstance(
uno::Reference< chart2::XDiagram > xDia( xChartDoc->getFirstDiagram());
if( xDia.is())
{
- // /-- locked controllers
+ // locked controllers
Reference< frame::XModel > xModel( xChartDoc, uno::UNO_QUERY );
ControllerLockGuard aCtrlLockGuard( xModel );
Reference< chart2::XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel
);
@@ -1344,17 +1342,15 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartDocumentWrapper::createInstance(
if( Application::GetSettings().GetLayoutRTL() )
AxisHelper::setRTLAxisLayout( AxisHelper::getCoordinateSystemByIndex(
xDiagram, 0 ) );
ThreeDHelper::setScheme( xDiagram, e3DScheme );
- // \-- locked controllers
}
else
{
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( Reference< frame::XModel >( xChartDoc,
uno::UNO_QUERY ));
xDia.set( xTemplate->createDiagramByDataSource(
uno::Reference< chart2::data::XDataSource >(),
uno::Sequence< beans::PropertyValue >()));
xChartDoc->setFirstDiagram( xDia );
- // \-- locked controllers
}
xResult = static_cast< ::cppu::OWeakObject* >( new DiagramWrapper(
m_spChart2ModelContact ));
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 1b46b17..b5d0aa0 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -179,7 +179,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence( DataSeriesPointWrappe
static uno::Sequence< Property > aSeriesPropSeq;
static uno::Sequence< Property > aPointPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
uno::Sequence< Property >& rPropSeq =
(_eType == DataSeriesPointWrapper::DATA_SERIES) ? aSeriesPropSeq : aPointPropSeq;
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 61682b0..de1ea75 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -439,7 +439,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -1159,7 +1158,6 @@ void SAL_CALL DiagramWrapper::dispose()
{
m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast<
::cppu::OWeakObject* >( this )));
- // /--
MutexGuard aGuard( GetMutex());
DisposeHelper::DisposeAndClear( m_xXAxisTitle );
@@ -1185,7 +1183,6 @@ void SAL_CALL DiagramWrapper::dispose()
DisposeHelper::DisposeAndClear( m_xDownBarWrapper );
clearWrappedPropertySet();
- // \--
}
void SAL_CALL DiagramWrapper::addEventListener(
@@ -1707,12 +1704,11 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any&
rOuterValue, con
{
try
{
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
uno::Reference< beans::XPropertySet > xProp( xTemplate, uno::UNO_QUERY );
xProp->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNewValue) );
xTemplate->changeDiagram( xDiagram );
- // \-- locked controllers
}
catch( uno::Exception & ex )
{
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 06220d2..cfaa50d 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -64,7 +64,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 1ca0c4e..e517f51 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -251,7 +251,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -356,10 +355,8 @@ void SAL_CALL LegendWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
clearWrappedPropertySet();
- // \--
}
void SAL_CALL LegendWrapper::addEventListener(
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 1690ea3..9bda2c5 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -61,7 +61,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -110,10 +109,8 @@ void SAL_CALL MinMaxLineWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
m_xInfo.clear();
- // \--
}
void SAL_CALL MinMaxLineWrapper::addEventListener(
@@ -134,14 +131,12 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener(
{
if(!m_pPropertyArrayHelper.get())
{
- // /--
::osl::MutexGuard aGuard( GetMutex() );
if(!m_pPropertyArrayHelper.get())
{
sal_Bool bSorted = sal_True;
m_pPropertyArrayHelper = ::boost::shared_ptr< ::cppu::OPropertyArrayHelper >( new
::cppu::OPropertyArrayHelper( lcl_GetPropertySequence(), bSorted ) );
}
- // \--
}
return *m_pPropertyArrayHelper.get();
}
@@ -152,11 +147,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
MinMaxLineWrapper::getPropert
{
if( !m_xInfo.is() )
{
- // /--
::osl::MutexGuard aGuard( GetMutex() );
if( !m_xInfo.is() )
m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
- // \--
}
return m_xInfo;
}
@@ -356,7 +349,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const ::rtl::OUString&
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 23cef15..b356996 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -187,7 +187,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -286,10 +285,8 @@ void SAL_CALL TitleWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
clearWrappedPropertySet();
- // \--
}
void SAL_CALL TitleWrapper::addEventListener(
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index ed81fb9..cfb5ce5 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -61,7 +61,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -113,10 +112,8 @@ void SAL_CALL UpDownBarWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
m_xInfo.clear();
- // \--
}
void SAL_CALL UpDownBarWrapper::addEventListener(
@@ -137,14 +134,12 @@ void SAL_CALL UpDownBarWrapper::removeEventListener(
{
if(!m_pPropertyArrayHelper.get())
{
- // /--
::osl::MutexGuard aGuard( GetMutex() );
if(!m_pPropertyArrayHelper.get())
{
sal_Bool bSorted = sal_True;
m_pPropertyArrayHelper = ::boost::shared_ptr< ::cppu::OPropertyArrayHelper >( new
::cppu::OPropertyArrayHelper( lcl_GetPropertySequence(), bSorted ) );
}
- // \--
}
return *m_pPropertyArrayHelper.get();
}
@@ -155,11 +150,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
UpDownBarWrapper::getProperty
{
if( !m_xInfo.is() )
{
- // /--
::osl::MutexGuard aGuard( GetMutex() );
if( !m_xInfo.is() )
m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
- // \--
}
return m_xInfo;
}
@@ -322,7 +315,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const ::rtl::OUString& r
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 2a69e0c..a31f971 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -64,7 +64,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -114,10 +113,8 @@ void SAL_CALL WallFloorWrapper::dispose()
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
- // /--
MutexGuard aGuard( GetMutex());
clearWrappedPropertySet();
- // \--
}
void SAL_CALL WallFloorWrapper::addEventListener(
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 1883d44..103a3af 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -116,10 +116,9 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any&
r
{
try
{
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
xTemplate->changeDiagram( xDiagram );
- // \-- locked controllers
}
catch( uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index e384163..e8984a0 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -338,7 +338,7 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
{
uno::Reference< frame::XModel > xModel( xChartModel, uno::UNO_QUERY);
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( xModel );
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
DiagramHelper::tTemplateWithServiceName aTemplateWithService(
@@ -357,7 +357,6 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
if( xDiaProp.is() )
xDiaProp->setPropertyValue( C2U( "SortByXValues" ), uno::makeAny(
rParameter.bSortByXValues ) );
}
- // \-- locked controllers
}
return false;
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 9961089..799b263 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -144,7 +144,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
{
static uno::Sequence< uno::Type > aTypeList;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !aTypeList.getLength() )
{
@@ -162,7 +161,6 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
}
return aTypeList;
- // \--
}
uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw(
uno::RuntimeException )
{
@@ -294,7 +292,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
m_xChartModel.clear();
m_xParentWindow.clear();
- // /--
SolarMutexGuard aSolarGuard;
if( m_pDialog )
{
@@ -317,7 +314,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
{
ASSERT_EXCEPTION( ex );
}
- // \--
}
//XPropertySet
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 5351ef7..92eb971 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -182,11 +182,10 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
break;
}
- // /-- locked controllers
+ // locked controllers
ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
ThreeDHelper::setRoundedEdgesAndObjectLines(
::chart::ChartModelHelper::findDiagram( m_xChartModel ), nCurrentRoundedEdges,
nObjectLines );
- // \-- locked controllers
}
void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel()
@@ -307,7 +306,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
return 0;
{
- // /-- locked controllers
+ // locked controllers
ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram(
m_xChartModel ) );
@@ -320,7 +319,6 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG )
{
OSL_ENSURE( false, "Invalid Entry selected" );
}
- // \-- locked controllers
}
// update other controls
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index d5cbb4d..9465c9c 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -68,7 +68,7 @@
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/frame/LayoutManagerEvents.hpp>
-//-------
+/-------
// header for define RET_OK
#include <vcl/msgbox.hxx>
//-------
@@ -784,7 +784,7 @@ void ChartController::impl_deleteDrawViewController()
uno::Reference< util::XModeChangeBroadcaster > xViewBroadcaster( m_xChartView,
uno::UNO_QUERY );
if( xViewBroadcaster.is() )
xViewBroadcaster->removeModeChangeListener(this);
- // /--
+
impl_invalidateAccessible();
SolarMutexGuard aSolarGuard;
impl_deleteDrawViewController();
@@ -797,7 +797,6 @@ void ChartController::impl_deleteDrawViewController()
m_pChartWindow = NULL;//m_pChartWindow is deleted via UNO due to dispose of
m_xViewWindow (trigerred by Framework (Controller pretends to be XWindow also))
m_xViewWindow->dispose();
m_xChartView.clear();
- // \--
}
// remove as listener to layout manager events
@@ -1312,7 +1311,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
UndoLiveUpdateGuard aUndoGuard = UndoLiveUpdateGuard(
::rtl::OUString( String( SchResId( STR_ACTION_EDIT_CHARTTYPE ))), m_xUndoManager,
getModel() );
- // /--
SolarMutexGuard aSolarGuard;
//prepare and open dialog
ChartTypeDialog aDlg( m_pChartWindow, getModel(), m_xCC );
@@ -1321,7 +1319,6 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
impl_adaptDataSeriesAutoResize();
aUndoGuard.commitAction();
}
- // \--
}
void SAL_CALL ChartController::executeDispatch_SourceData()
@@ -1338,7 +1335,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
::rtl::OUString( String( SchResId( STR_ACTION_EDIT_DATA_RANGES ))), m_xUndoManager,
getModel() );
if( xChartDoc.is())
{
- // /--
SolarMutexGuard aSolarGuard;
::chart::DataSourceDialog aDlg( m_pChartWindow, xChartDoc, m_xCC );
if( aDlg.Execute() == RET_OK )
@@ -1346,7 +1342,6 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
impl_adaptDataSeriesAutoResize();
aUndoGuard.commitAction();
}
- // \--
}
}
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx
b/chart2/source/controller/main/ChartController_EditData.cxx
index 21a182c..d75c43b 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -63,7 +63,6 @@ void ChartController::executeDispatch_EditData()
Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider(
xChartDoc->getDataProvider());
{
- // /--
SolarMutexGuard aSolarGuard;
// using assignment for broken gcc 3.3
UndoLiveUpdateGuardWithData aUndoGuard = UndoLiveUpdateGuardWithData(
@@ -73,7 +72,6 @@ void ChartController::executeDispatch_EditData()
// the dialog has no OK/Cancel
aDataEditorDialog.Execute();
aUndoGuard.commitAction();
- // \--
}
}
}
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx
b/chart2/source/controller/main/ChartController_Properties.cxx
index dff8e65..79ad260 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -106,7 +106,7 @@ namespace
DBG_ERROR("unknown ObjectType");
return NULL;
}
- //--
+
rtl::OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
bool bAffectsMultipleObjects = aParticleID.equals(C2U("ALLELEMENTS"));
//-------------------------------------------------------------
@@ -842,13 +842,11 @@ void SAL_CALL ChartController::executeDispatch_View3D()
::rtl::OUString( String( SchResId( STR_ACTION_EDIT_3D_VIEW ))),
m_xUndoManager, getModel());
- // /--
//open dialog
SolarMutexGuard aSolarGuard;
View3DDialog aDlg( m_pChartWindow, getModel(), m_pDrawModelWrapper->GetColorTable() );
if( aDlg.Execute() == RET_OK )
aUndoGuard.commitAction();
- // \--
}
catch( uno::RuntimeException& e)
{
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx
b/chart2/source/controller/main/UndoCommandDispatch.cxx
index e53bac4..b1f8fa9 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -113,13 +113,11 @@ void SAL_CALL UndoCommandDispatch::dispatch(
if( m_xUndoManager.is() )
{
// why is it necessary to lock the solar mutex here?
- // /--
SolarMutexGuard aSolarGuard;
if( URL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Undo" )))
m_xUndoManager->undo( m_xModel );
else
m_xUndoManager->redo( m_xModel );
- // \--
}
}
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 815ef6a..1702ce7 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -56,14 +56,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
// includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet
public ::cppu::OPropertySetHelper,
// includes uno::XWeak (and XInterface, esp. ref-counting)
-// public virtual ::cppu::OWeakObject,
-// public virtual ::com::sun::star::lang::XServiceInfo,
public ::com::sun::star::lang::XTypeProvider,
public ::com::sun::star::beans::XPropertyState,
public ::com::sun::star::beans::XMultiPropertyStates,
public ::com::sun::star::style::XStyleSupplier
-// public ::com::sun::star::beans::XFastPropertyState
{
public:
OPropertySet( ::osl::Mutex & rMutex );
@@ -101,7 +98,6 @@ protected:
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -110,7 +106,6 @@ protected:
}
return xInfo;
- // \--
}
</pre>
@@ -121,9 +116,6 @@ protected:
@see ::cppu::OPropertySetHelper
*/
-// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL
-// getPropertySetInfo()
-// throw (::com::sun::star::uno::RuntimeException) = 0;
/** Try to convert the value <code>rValue</code> to the type required by the
property associated with <code>nHandle</code>.
@@ -206,20 +198,6 @@ protected:
// ____ XInterface ____
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type&
aType )
throw (::com::sun::star::uno::RuntimeException);
-// virtual void SAL_CALL acquire() throw ();
-// virtual void SAL_CALL release() throw ();
-
-
- // ____ XServiceInfo ____
-// virtual ::rtl::OUString SAL_CALL
-// getImplementationName()
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL
-// supportsService( const ::rtl::OUString& ServiceName )
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-// getSupportedServiceNames()
-// throw (::com::sun::star::uno::RuntimeException);
// ____ XTypeProvider ____
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
@@ -271,21 +249,6 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- // ____ XFastPropertyState ____
-// virtual ::com::sun::star::beans::PropertyState SAL_CALL getFastPropertyState( sal_Int32
nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
getFastPropertyStates( const ::com::sun::star::uno::Sequence< sal_Int32 >& aHandles )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual void SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::lang::WrappedTargetException,
-// ::com::sun::star::uno::RuntimeException);
-
// ____ XMultiPropertySet ____
virtual void SAL_CALL setPropertyValues(
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index ba82935..afd8a83 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -222,7 +222,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -444,27 +443,21 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData )
chart2::ScaleData SAL_CALL Axis::getScaleData()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aMutex );
return m_aScaleData;
- // \--
}
Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aMutex );
return m_xGrid;
- // \--
}
Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aMutex );
return m_aSubGridProperties;
- // \--
}
Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties()
@@ -479,10 +472,8 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL
Axis::getSubTickProperties
Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
return m_xTitle;
- // \--
}
void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle )
@@ -580,7 +571,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -598,7 +588,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL Axis::getInfoHelper()
@@ -614,7 +603,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -623,7 +611,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ================================================================================
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx
b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 91503f7..a8ba536 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -80,7 +80,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -355,7 +354,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -370,7 +368,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -390,7 +387,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -399,7 +395,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
using impl::BaseCoordinateSystem_Base;
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index d32a5cb..4d8765e 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -773,10 +773,8 @@ sal_Bool SAL_CALL ChartModel::hasInternalDataProvider()
uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aModelMutex );
return m_xDataProvider;
- // \--
}
// ____ XDataReceiver ____
@@ -785,7 +783,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
throw (uno::RuntimeException)
{
{
- // /--
MutexGuard aGuard( m_aModelMutex );
uno::Reference< beans::XPropertySet > xProp( xDataProvider, uno::UNO_QUERY );
if( xProp.is() )
@@ -804,7 +801,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data
m_xInternalDataProvider.clear();
//the numberformatter is kept independent of the data provider!
- // \--
}
setModified( sal_True );
}
@@ -813,7 +809,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
throw (uno::RuntimeException)
{
{
- // /--
MutexGuard aGuard( m_aModelMutex );
if( xNewSupplier==m_xNumberFormatsSupplier )
return;
@@ -836,7 +831,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti
m_xNumberFormatsSupplier.set( xNewSupplier );
m_xOwnNumberFormatsSupplier.clear();
- // \--
}
setModified( sal_True );
}
@@ -846,7 +840,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
uno::RuntimeException)
{
{
- // /--
MutexGuard aGuard( m_aModelMutex );
if( !m_xDataProvider.is() )
return;
@@ -890,7 +883,6 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
ASSERT_EXCEPTION( ex );
}
unlockControllers();
- // \--
}
setModified( sal_True );
}
@@ -932,10 +924,8 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference<
chart2::XCh
throw (uno::RuntimeException)
{
{
- // /--
MutexGuard aGuard( m_aModelMutex );
m_xChartTypeManager = xNewManager;
- // \--
}
setModified( sal_True );
}
@@ -943,42 +933,34 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference<
chart2::XCh
uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aModelMutex );
return m_xChartTypeManager;
- // \--
}
uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aModelMutex );
return m_xPageBackground;
- // \--
}
// ____ XTitled ____
uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( m_aModelMutex );
return m_xTitle;
- // \--
}
void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle )
throw (uno::RuntimeException)
{
{
- // /--
MutexGuard aGuard( m_aModelMutex );
if( m_xTitle.is() )
ModifyListenerHelper::removeListener( m_xTitle, this );
m_xTitle = xTitle;
ModifyListenerHelper::addListener( m_xTitle, this );
- // \--
}
setModified( sal_True );
}
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 7f99363..1ddc321 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -58,7 +58,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -234,7 +233,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -243,7 +241,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 2e8a3f7..35cc839 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -60,7 +60,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -248,7 +247,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -269,7 +267,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
throw beans::UnknownPropertyException();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -290,7 +287,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -299,7 +295,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
void SAL_CALL DataSeries::getFastPropertyValue
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 9bfcaf5..eb58b1c 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -193,7 +193,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -594,7 +593,6 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -610,7 +608,6 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -630,7 +627,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -639,7 +635,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XFastPropertySet ____
diff --git a/chart2/source/model/main/FormattedString.cxx
b/chart2/source/model/main/FormattedString.cxx
index ac11b13..3108f63 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -52,7 +52,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -114,10 +113,8 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
::rtl::OUString SAL_CALL FormattedString::getString()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex());
return m_aString;
- // \--
}
void SAL_CALL FormattedString::setString( const ::rtl::OUString& String )
@@ -204,7 +201,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -219,7 +215,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
throw beans::UnknownPropertyException();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -236,7 +231,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -245,7 +239,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ================================================================================
diff --git a/chart2/source/model/main/GridProperties.cxx
b/chart2/source/model/main/GridProperties.cxx
index 12c119f..3962a68 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -87,7 +87,6 @@ const Sequence< Property > & lcl_getPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -152,7 +151,6 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
lcl_addDefaultsToMap( aStaticDefaults );
@@ -164,7 +162,6 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL GridProperties::getInfoHelper()
@@ -179,7 +176,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -188,7 +184,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XCloneable ____
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 7085834..3fe0a25 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -125,7 +125,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -312,7 +311,6 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -330,7 +328,6 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
return Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL Legend::getInfoHelper()
@@ -346,7 +343,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -355,7 +351,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/model/main/PageBackground.cxx
b/chart2/source/model/main/PageBackground.cxx
index 5ae63b4..4bd4fd9 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -66,7 +66,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -135,7 +134,6 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -153,7 +151,6 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL PageBackground::getInfoHelper()
@@ -169,7 +166,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -178,7 +174,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 0a4bdbd..2d8f70d 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -62,7 +62,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -147,7 +146,6 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -166,7 +164,6 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL StockBar::getInfoHelper()
@@ -181,7 +178,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -190,7 +186,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 44f4742..e3a55b7 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -184,7 +184,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -286,7 +285,6 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -306,7 +304,6 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL Title::getInfoHelper()
@@ -322,7 +319,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -331,7 +327,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 5f667a2..661d3a6 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -71,7 +71,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -138,7 +137,6 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -159,7 +157,6 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL Wall::getInfoHelper()
@@ -175,7 +172,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -184,7 +180,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx
b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index e3dbfdf..d5e71c0 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -81,7 +81,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -136,7 +135,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -151,7 +149,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL AreaChartTypeTemplate::getInfoHelper()
@@ -167,7 +164,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -176,7 +172,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
sal_Int32 AreaChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx
b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 7a98bba..8715784 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -89,7 +89,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -229,7 +228,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -244,7 +242,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL BarChartTypeTemplate::getInfoHelper()
@@ -260,7 +257,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -269,7 +265,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
void SAL_CALL BarChartTypeTemplate::applyStyle(
diff --git a/chart2/source/model/template/BubbleChartType.cxx
b/chart2/source/model/template/BubbleChartType.cxx
index e5f13f0..7eef337 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -66,7 +66,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -180,7 +179,6 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -195,7 +193,6 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -215,7 +212,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -224,7 +220,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index c25515b..9f4dfb3 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -75,7 +75,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -126,7 +125,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -141,7 +139,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL BubbleChartTypeTemplate::getInfoHelper()
@@ -157,7 +154,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -166,7 +162,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
sal_Int32 BubbleChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/CandleStickChartType.cxx
b/chart2/source/model/template/CandleStickChartType.cxx
index 1f87b2c..9704d4b 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -111,7 +111,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -123,7 +122,7 @@ const Sequence< Property > & lcl_GetPropertySequence()
::std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
- // transfer result to static Sequence
+ // transfer result to static Sequence
aPropSeq = ::chart::ContainerHelper::ContainerToSequence( aProperties );
}
@@ -264,7 +263,6 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -279,7 +277,6 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -299,7 +296,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -308,7 +304,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 34919a7..3a4febf 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -249,7 +249,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -258,7 +257,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XModifyBroadcaster ____
diff --git a/chart2/source/model/template/ColumnChartType.cxx
b/chart2/source/model/template/ColumnChartType.cxx
index 4c2df06..3029c08 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -84,7 +84,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -141,7 +140,6 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -156,7 +154,6 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL ColumnChartType::getInfoHelper()
@@ -174,7 +171,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -183,10 +179,8 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
-//
uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static()
{
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 1a92079..4f1ee78 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -87,7 +87,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -142,7 +141,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -157,7 +155,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL ColumnLineChartTypeTemplate::getInfoHelper()
@@ -173,7 +170,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -182,7 +178,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
void ColumnLineChartTypeTemplate::createChartTypes(
diff --git a/chart2/source/model/template/LineChartType.cxx
b/chart2/source/model/template/LineChartType.cxx
index 481b33a..379b3da 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -94,7 +94,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -153,7 +152,6 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -168,7 +166,6 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL LineChartType::getInfoHelper()
@@ -187,7 +184,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -196,7 +192,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx
b/chart2/source/model/template/LineChartTypeTemplate.cxx
index f7eaca9..91f8b6b 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -104,7 +104,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -164,7 +163,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -179,7 +177,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL LineChartTypeTemplate::getInfoHelper()
@@ -195,7 +192,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -204,7 +200,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
sal_Int32 LineChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/NetChartType.cxx
b/chart2/source/model/template/NetChartType.cxx
index 1297c60..33a3af7 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -124,7 +124,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -133,7 +132,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
//-----------------------------------------------------------------------------
diff --git a/chart2/source/model/template/PieChartType.cxx
b/chart2/source/model/template/PieChartType.cxx
index aeec69a..1dcf295 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -78,7 +78,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -177,7 +176,6 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -192,7 +190,6 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -212,7 +209,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -221,7 +217,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/ScatterChartType.cxx
b/chart2/source/model/template/ScatterChartType.cxx
index 56a8992..f2bb0bc 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -98,7 +98,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -156,7 +155,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone()
}
// ____ XChartType ____
-// ____ XChartType ____
Reference< chart2::XCoordinateSystem > SAL_CALL
ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
throw (lang::IllegalArgumentException,
@@ -217,13 +215,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
ScatterChartType::getSupportedOptional
{
static uno::Sequence< ::rtl::OUString > aOptRolesSeq;
-// if( aOptRolesSeq.getLength() == 0 )
-// {
-// aOptRolesSeq.realloc( 2 );
-// aOptRolesSeq[0] = C2U( "error-bars-x" );
-// aOptRolesSeq[1] = C2U( "error-bars-y" );
-// }
-
return aOptRolesSeq;
}
@@ -234,7 +225,6 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -249,7 +239,6 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
// ____ OPropertySet ____
@@ -269,7 +258,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -278,7 +266,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static()
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index e6277ad..3268a3e 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -106,7 +106,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -165,7 +164,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -180,7 +178,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL ScatterChartTypeTemplate::getInfoHelper()
@@ -196,7 +193,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -205,7 +201,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
sal_Int32 ScatterChartTypeTemplate::getDimension() const
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx
b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 996ba50..6e42bc0 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -118,7 +118,6 @@ const Sequence< Property > & lcl_GetPropertySequence()
{
static Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -183,7 +182,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -198,7 +196,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL StockChartTypeTemplate::getInfoHelper()
@@ -214,7 +211,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -223,7 +219,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
sal_Int32 StockChartTypeTemplate::getAxisCountByDimension( sal_Int32 nDimension )
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index c8014de..0a49170 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -288,47 +288,32 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName )
Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
if( m_eCurrentDataType == NUMERICAL )
return m_aNumericalSequence;
else
return Impl_getNumericalData();
- // \--
}
// ________ XTextualDataSequence ________
Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
if( m_eCurrentDataType == TEXTUAL )
return m_aTextualSequence;
else
return Impl_getTextualData();
- // \--
}
-// void SAL_CALL CachedDataSequence::setTextualData( const Sequence< OUString >& aData )
-// throw (uno::RuntimeException)
-// {
-// // /--
-// MutexGuard aGuard( GetMutex() );
-// Impl_setTextualData( aData );
-// // \--
-// }
-
// ________ XDataSequence ________
Sequence< Any > SAL_CALL CachedDataSequence::getData()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
return Impl_getMixedData();
- // \--
}
OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation()
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 2ed6c68..6c72698 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -463,10 +463,9 @@ void DataSourceHelper::setRangeSegmentation(
if( !xTemplate.is() )
return;
- // /-- locked controllers
+ // locked controllers
ControllerLockGuard aCtrlLockGuard( xChartModel );
xTemplate->changeDiagramData( xDiagram, xDataSource, aArguments );
- // \-- locked controllers
}
Sequence< OUString > DataSourceHelper::getRangesFromLabeledDataSequence(
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 044c01f..ab77592 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -123,7 +123,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -211,7 +210,6 @@ uno::Any ErrorBar::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -227,7 +225,6 @@ uno::Any ErrorBar::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL ErrorBar::getInfoHelper()
@@ -243,7 +240,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -252,7 +248,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ____ XModifyBroadcaster ____
diff --git a/chart2/source/tools/RegressionCurveModel.cxx
b/chart2/source/tools/RegressionCurveModel.cxx
index 39dc57c..37f3222 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -68,7 +68,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -243,7 +242,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -258,7 +256,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL RegressionCurveModel::getInfoHelper()
@@ -274,7 +271,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
{
static uno::Reference< beans::XPropertySetInfo > xInfo;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -283,7 +279,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
// ================================================================================
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 2c8324f..d791ba2 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -67,7 +67,6 @@ enum
{
PROP_EQUATION_SHOW,
PROP_EQUATION_SHOW_CORRELATION_COEFF,
-// PROP_EQUATION_SEPARATOR,
PROP_EQUATION_REF_PAGE_SIZE,
PROP_EQUATION_REL_POS,
PROP_EQUATION_NUMBER_FORMAT
@@ -90,13 +89,6 @@ void lcl_AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
-// rOutProperties.push_back(
-// Property( C2U( "Separator" ),
-// PROP_EQUATION_SEPARATOR,
-// ::getCppuType( reinterpret_cast< ::rtl::OUString * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
rOutProperties.push_back(
Property( C2U( "ReferencePageSize" ),
PROP_EQUATION_REF_PAGE_SIZE,
@@ -124,7 +116,6 @@ void lcl_AddDefaultsToMap(
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap,
PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR,
::rtl::OUString( sal_Unicode( '\n' )));
// override other defaults
::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE,
drawing::FillStyle_NONE );
@@ -140,7 +131,6 @@ const uno::Sequence< Property > & lcl_GetPropertySequence()
{
static uno::Sequence< Property > aPropSeq;
- // /--
MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aPropSeq.getLength() )
{
@@ -209,7 +199,6 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
{
static tPropertyValueMap aStaticDefaults;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( 0 == aStaticDefaults.size() )
{
@@ -229,7 +218,6 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
return uno::Any();
return (*aFound).second;
- // \--
}
::cppu::IPropertyArrayHelper & SAL_CALL RegressionEquation::getInfoHelper()
@@ -244,7 +232,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
{
static Reference< beans::XPropertySetInfo > xInfo;
- // /--
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !xInfo.is())
{
@@ -253,7 +240,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
return xInfo;
- // \--
}
@@ -317,16 +303,13 @@ void RegressionEquation::fireModifyEvent()
uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
return m_aStrings;
- // \--
}
void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
chart2::XFormattedString > >& Strings )
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
ModifyListenerHelper::removeListenerFromAllElements(
ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
@@ -334,7 +317,6 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
ModifyListenerHelper::addListenerToAllElements(
ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
fireModifyEvent();
- // \--
}
// ================================================================================
diff --git a/chart2/source/tools/UncachedDataSequence.cxx
b/chart2/source/tools/UncachedDataSequence.cxx
index 87fff21..f1010db 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -58,7 +58,6 @@ static const OUString lcl_aServiceName(
enum
{
-// PROP_SOURCE_IDENTIFIER,
PROP_NUMBERFORMAT_KEY,
PROP_PROPOSED_ROLE,
PROP_XML_RANGE
@@ -186,7 +185,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
throw (uno::RuntimeException)
{
Sequence< double > aResult;
- // /--
MutexGuard aGuard( GetMutex() );
if( m_xDataProvider.is())
{
@@ -196,7 +194,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
aResult.getArray(), CommonFunctors::AnyToDouble());
}
return aResult;
- // \--
}
// ________ XTextualDataSequence ________
@@ -204,7 +201,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
throw (uno::RuntimeException)
{
Sequence< OUString > aResult;
- // /--
MutexGuard aGuard( GetMutex() );
if( m_xDataProvider.is())
{
@@ -214,19 +210,16 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
aResult.getArray(), CommonFunctors::AnyToString());
}
return aResult;
- // \--
}
// ________ XDataSequence ________
Sequence< Any > SAL_CALL UncachedDataSequence::getData()
throw (uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
if( m_xDataProvider.is())
return m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation );
return Sequence< Any >();
- // \--
}
OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation()
@@ -258,7 +251,6 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
lang::WrappedTargetException,
uno::RuntimeException)
{
- // /--
MutexGuard aGuard( GetMutex() );
Sequence< Any > aData( getData());
if( Index < aData.getLength() &&
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 9ebcac3..7d8c103 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -67,7 +67,6 @@ Reference< beans::XPropertyState > WrappedPropertySet::getInnerPropertyState()
void WrappedPropertySet::clearWrappedPropertySet()
{
- // /--
::osl::MutexGuard aGuard( m_aMutex );
//delete all wrapped properties
@@ -85,7 +84,6 @@ void WrappedPropertySet::clearWrappedPropertySet()
DELETEZ(m_pWrappedPropertyMap);
m_xInfo = NULL;
- // \--
}
//XPropertySet
@@ -94,13 +92,11 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet
{
if( !m_xInfo.is() )
{
- // /--
::osl::MutexGuard aGuard( m_aMutex );
if( !m_xInfo.is() )
{
m_xInfo = ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
}
- // \--
}
return m_xInfo;
}
@@ -208,7 +204,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr
else
xInnerPropertySet->addPropertyChangeListener( rPropertyName, xListener );
}
-// m_aBoundListenerContainer.addInterface( (sal_Int32)nHandle, xListener );
}
void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName,
const Reference< beans::XPropertyChangeListener >& aListener )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
@@ -438,14 +433,12 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const
Sequence
{
if(!m_pPropertyArrayHelper)
{
- // /--
::osl::MutexGuard aGuard( m_aMutex );
if(!m_pPropertyArrayHelper)
{
sal_Bool bSorted = sal_True;
m_pPropertyArrayHelper = new ::cppu::OPropertyArrayHelper( getPropertySequence(),
bSorted );
}
- // \--
}
return *m_pPropertyArrayHelper;
}
@@ -456,7 +449,6 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
{
if(!m_pWrappedPropertyMap)
{
- // /--
::osl::MutexGuard aGuard( m_aMutex );
if(!m_pWrappedPropertyMap)
{
@@ -486,7 +478,6 @@ tWrappedPropertyMap& WrappedPropertySet::getWrappedPropertyMap()
}
}
}
- // \--
}
return *m_pWrappedPropertyMap;
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 616afe7..77e885d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -197,13 +197,11 @@ void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >&
aArguments
if( !m_pDrawModelWrapper.get() )
{
- // /--
SolarMutexGuard aSolarGuard;
m_pDrawModelWrapper = ::boost::shared_ptr< DrawModelWrapper >( new DrawModelWrapper( m_xCC
) );
m_xShapeFactory = m_pDrawModelWrapper->getShapeFactory();
m_xDrawPage = m_pDrawModelWrapper->getMainDrawPage();
StartListening( m_pDrawModelWrapper->getSdrModel(), FALSE /*bPreventDups*/ );
- // \--
}
}
@@ -463,7 +461,6 @@ struct AxisUsage
void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32
nAxisIndex );
::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32
nAxisIndex );
sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
- //tFullAxisIndex getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys );
ScaleAutomatism aScaleAutomatism;
@@ -482,19 +479,6 @@ AxisUsage::~AxisUsage()
aCoordinateSystems.clear();
}
-/*
-tFullScaleIndex AxisUsage::getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys )
-{
- tFullScaleIndex aRet(0,0);
-
- tCoordinateSystemMap::const_iterator aFound( aCoordinateSystems.find(pCooSys) );
- if(aFound!=aCoordinateSystems.end())
- aRet = aFound->second;
-
- return aRet;
-}
-*/
-
void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex,
sal_Int32 nAxisIndex )
{
if(!pCooSys)
@@ -1557,24 +1541,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped();
}
- /*
- uno::Reference< drawing::XShape > xDiagramPlusAxes_KeepRatio( xDiagramPlusAxes_Shapes,
uno::UNO_QUERY );
-
- awt::Size aNewSize( rAvailableSize );
- awt::Point aNewPos( rAvailablePos );
- if( bKeepAspectRatio )
- {
- awt::Size aCurrentSize( xDiagramPlusAxes_KeepRatio->getSize());
-
- aNewSize = ShapeFactory::calculateNewSizeRespectingAspectRatio(
- rAvailableSize, aCurrentSize );
- aNewPos = ShapeFactory::calculateTopLeftPositionToCenterObject(
- rAvailablePos, rAvailableSize, aNewSize );
- }
-
- xDiagramPlusAxes_KeepRatio->setPosition( aNewPos );
- xDiagramPlusAxes_KeepRatio->setSize( aNewSize );
- */
for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd;
aPlotterIter++ )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1584,8 +1550,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
if( bUseFixedInnerSize )
{
- //if( !bIsPieOrDonut )
- // aConsumedOuterRect = ::basegfx::B2IRectangle(
ShapeFactory::getRectangleOfShape(xBoundingShape) );
aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(),
aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() );
}
else
@@ -2598,12 +2562,10 @@ void ChartView::createShapes()
impl_deleteCoordinateSystems();
if( m_pDrawModelWrapper )
{
- // /--
SolarMutexGuard aSolarGuard;
// #i12587# support for shapes in chart
m_pDrawModelWrapper->getSdrModel().EnableUndo( FALSE );
m_pDrawModelWrapper->clearMainDrawPage();
- // \--
}
lcl_setDefaultWritingMode( m_pDrawModelWrapper, m_xChartModel );
@@ -2807,10 +2769,8 @@ void ChartView::impl_updateView()
//prepare draw model
{
- // /--
SolarMutexGuard aSolarGuard;
m_pDrawModelWrapper->lockControllers();
- // \--
}
//create chart view
@@ -2844,10 +2804,8 @@ void ChartView::impl_updateView()
}
{
- // /--
SolarMutexGuard aSolarGuard;
m_pDrawModelWrapper->unlockControllers();
- // \--
}
impl_notifyModeChangeListener(C2U("valid"));
--
1.7.3.5
Context
- [Libreoffice] [PATCHSET] calc - removal of dead code · Thomas Arnhold
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.