[Libreoffice-commits] .: 2 commits - chart2/source sc/source sc/workben
Kohei Yoshida
kohei at kemper.freedesktop.org
Tue Jan 18 09:19:41 PST 2011
chart2/source/controller/accessibility/AccStatisticsObject.hxx | 9 --
chart2/source/controller/dialogs/DialogModel.cxx | 4 -
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 9 --
chart2/source/controller/dialogs/dlg_DataSource.cxx | 1
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 1
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 1
chart2/source/controller/dialogs/dlg_View3D.cxx | 2
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 1
chart2/source/controller/main/ChartController_Window.cxx | 33 --------
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 -
chart2/source/model/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/inc/VDiagram.hxx | 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/drawfunc/drawsh.cxx | 3
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/pagedlg/areasdlg.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/scdetect.cxx | 2
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
sc/workben/addin.cxx | 9 --
124 files changed, 43 insertions(+), 498 deletions(-)
New commits:
commit 40815e82184a117275fb130d2e82799248830fba
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 17 17:38:29 2011 +0100
Remove some more dead code
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index 39ab30a..1aeaf23 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();
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;
}
commit fc7c9eb7e8fae1df33f9124b1d5d5fa403bd7ccd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 17 17:25:58 2011 +0100
Remove dead code: "//static" and "//virtual"
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 )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list